diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/aclocal.m4 /tmp/irThAZDHWn/libccc-0.0.5/aclocal.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/aclocal.m4 2006-09-03 19:56:40.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/aclocal.m4 2007-05-05 23:17:32.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,1463 +11,1203 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# 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, or (at your option) -# any later version. +dnl AM_PATH_CHECK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for check, and define CHECK_CFLAGS and CHECK_LIBS +dnl -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +AC_DEFUN([AM_PATH_CHECK], +[ + AC_MSG_WARN([A@&t@M_PATH_CHECK() is deprecated]) + AC_MSG_WARN([[use P@&t@KG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]]) + AC_ARG_WITH([check], + [ --with-check=PATH prefix where check is installed [default=auto]]) + + min_check_version=ifelse([$1], ,0.8.2,$1) + + AC_MSG_CHECKING(for check - version >= $min_check_version) + + if test x$with_check = xno; then + AC_MSG_RESULT(disabled) + ifelse([$3], , AC_MSG_ERROR([disabling check is not supported]), [$3]) + else + if test "x$with_check" != x; then + CHECK_CFLAGS="-I$with_check/include" + CHECK_LIBS="-L$with_check/lib -lcheck" + else + CHECK_CFLAGS="" + CHECK_LIBS="-lcheck" + fi -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" -AC_PREREQ([2.52]) + CFLAGS="$CFLAGS $CHECK_CFLAGS" + LIBS="$CHECK_LIBS $LIBS" -# serial 6 + rm -f conf.check-test + AC_COMPILE_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT([]) +#include -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) +int main () +{ + int major, minor, micro; + char *tmp_version; -# Do all the work for Automake. -*- Autoconf -*- + system ("touch conf.check-test"); -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = strdup("$min_check_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_check_version"); + return 1; + } + + if ((CHECK_MAJOR_VERSION != check_major_version) || + (CHECK_MINOR_VERSION != check_minor_version) || + (CHECK_MICRO_VERSION != check_micro_version)) + { + printf("\n*** The check header file (version %d.%d.%d) does not match\n", + CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION); + printf("*** the check library (version %d.%d.%d).\n", + check_major_version, check_minor_version, check_micro_version); + return 1; + } -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. + if ((check_major_version > major) || + ((check_major_version == major) && (check_minor_version > minor)) || + ((check_major_version == major) && (check_minor_version == minor) && (check_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of check (%d.%d.%d) was found.\n", + check_major_version, check_minor_version, check_micro_version); + printf("*** You need a version of check being at least %d.%d.%d.\n", major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the check library and header\n"); + printf("*** file is being found. Rerun configure with the --with-check=PATH option\n"); + printf("*** to specify the prefix where the correct version was installed.\n"); + } -# 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, or (at your option) -# any later version. + return 1; +} +])],, no_check=yes, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. + if test "x$no_check" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test -f conf.check-test ; then + : + else + echo "*** Could not run check test program, checking why..." + CFLAGS="$CFLAGS $CHECK_CFLAGS" + LIBS="$CHECK_LIBS $LIBS" + AC_TRY_LINK([ +#include +#include -# serial 10 +#include +], , [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding check. You'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for" + echo "*** the exact error that occured." ]) + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + CHECK_CFLAGS="" + CHECK_LIBS="" -AC_PREREQ([2.54]) + rm -f conf.check-test + ifelse([$3], , AC_MSG_ERROR([check not found]), [$3]) + fi -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_SUBST(CHECK_CFLAGS) + AC_SUBST(CHECK_LIBS) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi + rm -f conf.check-test -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo fi -fi -AC_SUBST([CYGPATH_W]) +]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl ]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + USE_NLS=yes + AC_SUBST(USE_NLS) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + gt_cv_have_gettext=no -# Copyright 2002 Free Software Foundation, Inc. + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# 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, or (at your option) -# any later version. + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.9])]) + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -# Helper functions for option handling. -*- Autoconf -*- + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -# Copyright 2001, 2002 Free Software Foundation, Inc. + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -# 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, or (at your option) -# any later version. + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([msgfmt -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi -# serial 2 + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + # We need to process the po/ directory. + POSUB=po -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -# -# Check to make sure that the build environment is sane. -# +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -# 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, or (at your option) -# any later version. + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) + localedir=`eval echo "${datadir}/locale"` fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_in,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl -# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -# 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, or (at your option) -# any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +dnl -*- mode: autoconf -*- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 1 -# serial 3 +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi ]) + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi -# AM_AUX_DIR_EXPAND - -# Copyright 2001 Free Software Foundation, Inc. - -# 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, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 35 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], +[AC_PREREQ([2.50])dnl -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) +if test -n "$1"; then + AC_MSG_CHECKING(for intltool >= $1) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` + [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi -# Copyright 2001 Free Software Foundation, Inc. + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -# 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, or (at your option) -# any later version. +AC_SUBST(INTLTOOL_DESKTOP_RULE) +AC_SUBST(INTLTOOL_DIRECTORY_RULE) +AC_SUBST(INTLTOOL_KEYS_RULE) +AC_SUBST(INTLTOOL_PROP_RULE) +AC_SUBST(INTLTOOL_OAF_RULE) +AC_SUBST(INTLTOOL_PONG_RULE) +AC_SUBST(INTLTOOL_SERVER_RULE) +AC_SUBST(INTLTOOL_SHEET_RULE) +AC_SUBST(INTLTOOL_SOUNDLIST_RULE) +AC_SUBST(INTLTOOL_UI_RULE) +AC_SUBST(INTLTOOL_XAM_RULE) +AC_SUBST(INTLTOOL_KBD_RULE) +AC_SUBST(INTLTOOL_XML_RULE) +AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) +AC_SUBST(INTLTOOL_CAVES_RULE) +AC_SUBST(INTLTOOL_SCHEMAS_RULE) +AC_SUBST(INTLTOOL_THEME_RULE) +AC_SUBST(INTLTOOL_SERVICE_RULE) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Use the tools built into the package, not the ones that are installed. +AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found; required for intltool]) +fi +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then + AC_MSG_ERROR([perl 5.x required for intltool]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) +AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) +AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) +AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) +AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) -# AM_PROG_INSTALL_STRIP +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) -# Copyright 2001 Free Software Foundation, Inc. +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) -# 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, or (at your option) -# any later version. +IT_PO_SUBDIR([po]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +dnl The following is very similar to +dnl +dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) +dnl +dnl with the following slight differences: +dnl - the *.in files are in ac_aux_dir, +dnl - if the file haven't changed upon reconfigure, it's not touched, +dnl - the evaluation of the third parameter enables a hack which computes +dnl the actual value of $libdir, +dnl - the user sees "executing intltool commands", instead of +dnl "creating intltool-extract" and such. +dnl +dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were +dnl a reason for it. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +AC_CONFIG_COMMANDS([intltool], [ -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ + -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ + -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ + -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ + -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then + rm -f ${file}.out + else + mv -f ${file}.out ${file} + fi + chmod ugo+x ${file} + chmod u+w ${file} +done -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. +], +[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' +prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' +INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' +INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) -# 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, or (at your option) -# any later version. +]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + if test ! -f "$1/Makefile"; then + AC_MSG_ERROR([$1/Makefile is not ready.]) + fi + mv "$1/Makefile" "$1/Makefile.tmp" + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.tmp" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) -# serial 1 -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) -# serial 5 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# 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, or (at your option) -# any later version. +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac -# Generate code to set up dependency tracking. -*- Autoconf -*- +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -# 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, or (at your option) -# any later version. +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Constants: +rm="rm -f" -#serial 2 +# Global variables: +default_ofile=libtool +can_build_shared=yes -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) +old_CC="$CC" +old_CFLAGS="$CFLAGS" -# Check to see how 'make' treats includes. -*- Autoconf -*- +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= -# 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, or (at your option) -# any later version. +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +_LT_CC_BASENAME([$compiler]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + AC_PATH_MAGIC + fi + ;; +esac -# serial 2 +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +enable_win32_dll=yes, enable_win32_dll=no) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# 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, or (at your option) -# any later version. +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -# serial 5 +# _LT_AC_SYS_COMPILER +# ------------------- +AC_DEFUN([_LT_AC_SYS_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl -AC_PREREQ(2.52) +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_AC_SYS_COMPILER -# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. -# 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, or (at your option) -# any later version. +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE -# serial 2 -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# aclocal-include.m4 -# -# This macro adds the name macrodir to the set of directories -# that `aclocal' searches for macros. +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX -# serial 1 -dnl AM_ACLOCAL_INCLUDE(macrodir) -AC_DEFUN([AM_ACLOCAL_INCLUDE], -[ - AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done -]) +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +[_LT_AC_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 35 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], -[AC_PREREQ([2.50])dnl +echo=${ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +fi -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat <= $1) +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) - -# Use the tools built into the package, not the ones that are installed. -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -IT_PO_SUBDIR([po]) - -dnl The following is very similar to -dnl -dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) -dnl -dnl with the following slight differences: -dnl - the *.in files are in ac_aux_dir, -dnl - if the file haven't changed upon reconfigure, it's not touched, -dnl - the evaluation of the third parameter enables a hack which computes -dnl the actual value of $libdir, -dnl - the user sees "executing intltool commands", instead of -dnl "creating intltool-extract" and such. -dnl -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -dnl a reason for it. - -AC_CONFIG_COMMANDS([intltool], [ - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ - < ${ac_aux_dir}/${file}.in > ${file}.out - if cmp -s ${file} ${file}.out 2>/dev/null; then - rm -f ${file}.out - else - mv -f ${file}.out ${file} - fi - chmod ugo+x ${file} - chmod u+w ${file} -done - -], -[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - if test ! -f "$1/Makefile"; then - AC_MSG_ERROR([$1/Makefile is not ready.]) - fi - mv "$1/Makefile" "$1/Makefile.tmp" - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.tmp" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -# Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null 2>&1 && unset CDPATH - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do @@ -7466,854 +7206,911 @@ AC_MSG_RESULT([$SED]) ]) -# herzi-ruby.m4 +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant . +# +# 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 program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# M4 macros to support building ruby modules with autoconf +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -dnl HERZI_RUBY_PRIV_CONFIG([VARNAME], [variable]) -dnl -dnl Get the value of the rbconfig variable $2 +pkg_failed=no +AC_MSG_CHECKING([for $1]) -AC_DEFUN([HERZI_RUBY_PRIV_CONFIG],[ - AC_MSG_CHECKING([for ruby configuration parameter "$2"]) - $1=`$RUBY -rrbconfig -e 'print Config::CONFIG[["$2"]]'` - AC_SUBST($1) - AC_MSG_RESULT($$1) -]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -dnl HERZI_PROG_RUBY([action if succ],[action if fail]) -dnl -dnl Checks for several aspects necessary to build ruby modules with an autotool -dnl toolchain. Sets RUBY to the name of the interpreter as well as RUBY_CFLAGS -dnl and RUBY_LIBS (just the same way PKG_CHECK_MODULES would do) - -AC_DEFUN([HERZI_PROG_RUBY],[ - AC_REQUIRE([HERZI_PACKAGE_PREFIX]) - AC_CHECK_PROGS(RUBY, [ruby ruby1.8 ruby1.6],[herzi-ruby-failed]) - - if test "x$RUBY" = "xherzi-ruby-failed"; then - ifelse([$2], , [AC_MSG_ERROR(dnl -[No ruby installation found, please install ruby from your distribution or from -http://www.ruby-lang.org/])], [$2]) - else - ifelse([$1], , [true], [$1]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) - HERZI_RUBY_PRIV_CONFIG(RUBY_ARCHDIR,archdir) - HERZI_RUBY_PRIV_CONFIG(RUBY_VERSION,ruby_version) - HERZI_RUBY_PRIV_CONFIG(RUBY_LIBS,LIBRUBYARG) - - RUBY_LIBDIR="${PACKAGE_PREFIX}/lib/ruby/$RUBY_VERSION" - AC_SUBST(RUBY_LIBDIR) - - RUBY_CFLAGS="-I$RUBY_ARCHDIR" - AC_SUBST(RUBY_CFLAGS) - - HERZI_CHECK_HEADER([ruby.h], - [ifelse([$1], , [true], [$1])], - [ifelse([$2], , [AC_MSG_ERROR([Please install ruby-dev])], [$2])], - [],[$RUBY_CFLAGS]) - fi -]) +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -dnl HERZI_RUBY_ARCHDIR -dnl -dnl Set RUBY_TARGET_ARCHDIR to a correct value matching to the specified prefix, issue -dnl a warning if ruby won't find it. Will even work if specified after a -dnl conditional HERZI_PROG_RUBY - -AC_DEFUN([HERZI_RUBY_ARCHDIR],[ - if test "x$RUBY" != "xherzi-ruby-failed"; then - herzi_ruby_archdir=`$RUBY -rrbconfig -e 'print Config::CONFIG[[\"archdir\"]]'` - fi -]) + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES -# herzi-cflags.m4 +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # -# File that contains autoconf macros that perfom checks with modified CFLAGS -# and CPPFLAGS +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl HERZI_PACKAGE_PREFIX -AC_DEFUN([HERZI_PACKAGE_PREFIX],[ - AC_MSG_CHECKING(prefix) - if test "x${prefix}" = "xNONE"; then - PACKAGE_PREFIX="${ac_default_prefix}" - else - PACKAGE_PREFIX="${prefix}" - fi - AC_SUBST(PACKAGE_PREFIX) - AC_MSG_RESULT($PACKAGE_PREFIX) -]) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.9.6])]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# herzi-cflags.m4 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # -# File that contains autoconf macros that perfom checks with modified CFLAGS -# and CPPFLAGS +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl HERZI_CHECK_HEADER([header.h],[action if succ],[action if fail],[include],[extra_flags]) -AC_DEFUN([HERZI_CHECK_HEADER],[ - HERZI_SAVE_CFLAGS="$CFLAGS" - HERZI_SAVE_CPPFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $5" - CPPFLAGS="$CPPFLAGS $5" - - AC_CHECK_HEADER([$1],[$2],[$3],[$4]) - - CFLAGS="$HERZI_SAVE_CFLAGS" - CPPFLAGS="$HERZI_SAVE_CPPFLAGS" -]) +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. -dnl HERZI_TRY_COMPILE([header.h],[action if succ],[action if fail],[include],[extra_flags]) -AC_DEFUN([HERZI_TRY_COMPILE],[ - HERZI_SAVE_CFLAGS="$CFLAGS" - HERZI_SAVE_CPPFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $6" - CPPFLAGS="$CPPFLAGS $6" - - AC_TRY_COMPILE([$1],[$2],[$3],[$4],[$5]) - - CFLAGS="$HERZI_SAVE_CFLAGS" - CPPFLAGS="$HERZI_SAVE_CPPFLAGS" +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -dnl HERZI_CHECK_CFLAGS("new cflags to try") -AC_DEFUN([HERZI_CHECK_CFLAGS],[ - HERZI_CFLAGS="" - - AC_CHECK_PROGS(XARGS,[xargs],no) - if test $XARGS = no; then - AC_MSG_ERROR([Couldn't find xargs, please install xargs]) - fi +# AM_CONDITIONAL -*- Autoconf -*- - for option in `echo $1 | $XARGS echo`; do - AC_MSG_CHECKING([whether $CC understands $option]) - HERZI_TRY_COMPILE([],[],has_option=yes,has_option=no,[],[$option]) - - if test $has_option = yes; then - HERZI_CFLAGS="$HERZI_CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - done +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - CFLAGS="$CFLAGS $HERZI_CFLAGS" -]) +# serial 7 -dnl HERZI_CHECK_DEVELOP_CFLAGS -AC_DEFUN([HERZI_CHECK_DEVELOP_CFLAGS],[ - HERZI_CHECK_CFLAGS("-Wall -Wno-uninitialized \ - -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith \ - -Wcast-align -Wsign-compare \ - -Wno-strict-aliasing -Wnested-externs -Wpointer-arith \ - -Werror-implicit-function-declaration -Wswitch -g") -]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# herzi-gprof.m4 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # -# File that contains autoconf macros that add --enable-gprof and -# --disable-gprof +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl HERZI_PROG_GPROF -AC_DEFUN([HERZI_PROG_GPROF],[ - AC_MSG_CHECKING(if using gprof) - AC_ARG_ENABLE(gprof,[ --enable-gprof Enable gprof (default=off)], - ENABLE_GPROF="$enableval", - ENABLE_GPROF="no") - if test "x$ENABLE_GPROF" = "xyes"; then - CFLAGS="-g -pg $CFLAGS" - LDFLAGS="-pg $LDFLAGS" - fi - AC_MSG_RESULT($ENABLE_GPROF) - AC_SUBST(ENABLE_GPROF) -]) +# serial 8 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -dnl -*- mode: autoconf -*- -# serial 1 +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - have_gtk_doc=no - if test x$enable_gtk_doc = xyes; then - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue else - AC_MSG_RESULT(no) - have_gtk_doc=no + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break fi fi -]) - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# 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 program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. + done -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +#serial 3 - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -$$1_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) -_PKG_TEXT -])], - [$4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_PKG_TEXT +# serial 8 -To get pkg-config, see .])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +# serial 12 -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi -AC_SUBST($1)dnl -]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) - gt_cv_have_gettext=no +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" +# serial 2 - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi +# serial 4 - # We need to process the po/ directory. - POSUB=po +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# Check to see how 'make' treats includes. -*- Autoconf -*- - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# serial 3 - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# serial 4 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - localedir=`eval echo "${datadir}/locale"` + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) ]) -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_in,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# herzi-gettext.m4 +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. # -# File that contains autoconf macros that initialize gettext parameters -# (GETTEXT_PACKAGE and PACKAGE_LOCALE_DIR) +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) -dnl HERZI_GETTEXT -AC_DEFUN([HERZI_GETTEXT],[ - AC_REQUIRE([AM_GLIB_GNU_GETTEXT]) - - GETTEXT_PACKAGE=$1 - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [The package name for gettext]) - AC_SUBST(GETTEXT_PACKAGE) - - PACKAGE_LOCALE_DIR="${PACKAGE_PREFIX}/${DATADIRNAME}/locale" - AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,"$PACKAGE_LOCALE_DIR", - [The package's locale path for gettext]) - AC_SUBST(PACKAGE_LOCALE_DIR) -]) +# Helper functions for option handling. -*- Autoconf -*- +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 3 -# Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# 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, or (at your option) -# any later version. +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# AM_PATH_PYTHON([MINIMUM-VERSION]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------------- # Adds support for distributing Python modules and packages. To # install modules, copy them to $(pythondir), using the python_PYTHON # automake variable. To install a package with the same name as the # automake package, install to $(pkgpythondir), or use the # pkgpython_PYTHON automake variable. - +# # The variables $(pyexecdir) and $(pkgpyexecdir) are provided as # locations to install python extension modules (shared libraries). # Another macro is required to find the appropriate flags to compile # extension modules. - +# # If your package is configured with a different prefix to python, # users will have to add the install directory to the PYTHONPATH # environment variable, or create a .pth file (see the python # documentation for details). - +# # If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will # cause an error if the version of python installed on the system # doesn't meet the requirement. MINIMUM-VERSION should consist of # numbers and dots only. - AC_DEFUN([AM_PATH_PYTHON], [ dnl Find a Python interpreter. Python versions prior to 1.5 are not dnl supported because the default installation locations changed from dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages dnl in 1.5. - m4_define([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5]) + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python python2 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0 python1.6 python1.5]) m4_if([$1],[],[ dnl No version check is needed. # Find any Python interpreter. - AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST) + if test -z "$PYTHON"; then + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi am_display_PYTHON=python ], [ dnl A version check is needed. @@ -8323,23 +8120,31 @@ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], [AC_MSG_RESULT(yes)], [AC_MSG_ERROR(too old)]) + am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. AC_CACHE_CHECK([for a Python interpreter with version >= $1], [am_cv_pathless_PYTHON],[ - for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST : ; do - if test "$am_cv_pathless_PYTHON" = : ; then - AC_MSG_ERROR([no suitable Python interpreter found]) - fi - AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) - done]) + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do + test "$am_cv_pathless_PYTHON" = none && break + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) + done]) # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) + fi am_display_PYTHON=$am_cv_pathless_PYTHON fi ]) + if test "$PYTHON" = :; then + dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else + dnl Query Python for its version number. Getting [:3] seems to be dnl the best way to do this; it's what "site.py" does in the standard dnl library. @@ -8399,6 +8204,11 @@ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi + ]) @@ -8420,22 +8230,11 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- - -# 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, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_RUN_LOG(COMMAND) # ------------------- @@ -8448,87 +8247,186 @@ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD (exit $ac_status); }]) -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN(AM_CHECK_PYMOD, -[AC_REQUIRE([AM_PATH_PYTHON]) -py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -ifelse([$2],[], [prog=" -import sys -try: - import $1 -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)"], [prog=" -import $1 -$1.$2"]) -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi -]) -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -if test "x$py_val" != xno; then - AC_MSG_RESULT(yes) - ifelse([$3], [],, [$3 -])dnl +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : else - AC_MSG_RESULT(no) - ifelse([$4], [],, [$4 -])dnl + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -]) +AC_MSG_RESULT(yes)]) -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi -AC_SUBST(PYTHON_INCLUDES) -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include ],dnl -[AC_MSG_RESULT(found) -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl -dnl JH_ADD_CFLAG(FLAG) -dnl checks whether the C compiler supports the given flag, and if so, adds -dnl it to $CFLAGS. If the flag is already present in the list, then the -dnl check is not performed. -AC_DEFUN([JH_ADD_CFLAG], -[ -case " $CFLAGS " in -*@<:@\ \ @:>@$1@<:@\ \ @:>@*) - ;; -*) - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - AC_MSG_CHECKING([whether [$]CC understands $1]) - AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) - AC_MSG_RESULT($jh_has_option) - if test $jh_has_option = no; then - CFLAGS="$save_CFLAGS" +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi - ;; -esac]) +done +rm -rf conftest.dir +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([macros/aclocal-include.m4]) +m4_include([macros/herzi-cflags.m4]) +m4_include([macros/herzi-gettext.m4]) +m4_include([macros/herzi-gprof.m4]) +m4_include([macros/herzi-prefix.m4]) +m4_include([macros/herzi-ruby.m4]) +m4_include([macros/python.m4]) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-brush.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-brush.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-brush.c 2006-06-13 12:02:16.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-brush.c 2007-04-20 09:39:56.000000000 +0100 @@ -23,29 +23,42 @@ #include +#include + G_DEFINE_ABSTRACT_TYPE(CcBrush, cc_brush, G_TYPE_INITIALLY_UNOWNED); /** * cc_brush_apply: * @self: a #CcBrush + * @view: a #CcView + * @item: a #CcItem * @cr: a cairo context * - * Apply a brush to a cairo context. This is usually used from item - * implementations while rendering to a context. + * Apply a brush to a cairo context. The brush will be used to display @item in + * @view. + * + * This is usually used from item implementations while rendering to a context. */ void -cc_brush_apply(CcBrush* self, cairo_t* cr) { +cc_brush_apply(CcBrush* self, + CcView * view, + CcItem * item, + cairo_t* cr) +{ g_return_if_fail(CC_IS_BRUSH(self)); g_return_if_fail(cr); - g_return_if_fail(CC_BRUSH_GET_CLASS(self)->apply); + cc_return_if_unimplemented_code(CC_BRUSH_GET_CLASS(self), apply, + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0)); - CC_BRUSH_GET_CLASS(self)->apply(self, cr); + CC_BRUSH_GET_CLASS(self)->apply(self, view, item, cr); } /* GType stuff */ static void -cc_brush_init(CcBrush* self) {} +cc_brush_init(CcBrush* self) +{ +} /** * CcBrushClass: @@ -55,5 +68,7 @@ * A brush class. */ static void -cc_brush_class_init(CcBrushClass* self_class) {} +cc_brush_class_init(CcBrushClass* self_class) +{ +} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-brush-color.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-brush-color.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-brush-color.c 2006-06-13 12:02:19.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-brush-color.c 2007-05-05 23:06:48.000000000 +0100 @@ -112,11 +112,17 @@ } static void -cbc_apply(CcBrush* brush, cairo_t* cr) { +cbc_apply(CcBrush* brush, + CcView * view G_GNUC_UNUSED, + CcItem * item G_GNUC_UNUSED, + cairo_t* cr) +{ CcBrushColor* self = CC_BRUSH_COLOR(brush); if(CC_IS_COLOR(self->color)) { - cc_color_apply(self->color, cr); + gdouble red, green, blue, alpha; + cc_color_apply(self->color, &red, &green, &blue, &alpha); + cairo_set_source_rgba(cr, red, green, blue, alpha); } } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-brush.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-brush.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-brush.h 2006-06-13 12:02:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-brush.h 2007-05-05 23:06:48.000000000 +0100 @@ -25,7 +25,7 @@ #define CC_BRUSH_H #include -#include +#include G_BEGIN_DECLS @@ -42,6 +42,8 @@ GType cc_brush_get_type(void); void cc_brush_apply(CcBrush* self, + CcView * view, + CcItem * item, cairo_t* cr); struct _CcBrush { @@ -53,6 +55,8 @@ /* vtable */ void (*apply) (CcBrush* brush, + CcView * view, + CcItem * item, cairo_t* cr); }; diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-cairo.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-cairo.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-cairo.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-cairo.c 2007-05-05 15:00:43.000000000 +0100 @@ -0,0 +1,30 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-cairo.h" + +#include +#include + +G_DEFINE_BOXED_TYPE_FULL (CcCairo, cc_cairo, cairo_reference, cairo_destroy); + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-cairo.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-cairo.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-cairo.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-cairo.h 2007-05-05 15:00:43.000000000 +0100 @@ -0,0 +1,36 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_CAIRO_H +#define CC_CAIRO_H + +#include + +G_BEGIN_DECLS + +#define CC_TYPE_CAIRO (cc_cairo_get_type ()) +GType cc_cairo_get_type (void); + +G_END_DECLS + +#endif /* !CC_CAIRO_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-camera.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-camera.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-camera.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-camera.c 2007-05-05 15:00:43.000000000 +0100 @@ -0,0 +1,345 @@ +/* This file is part of CCC, a cairo-based canvas + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-camera.h" + +#include + +struct CcCameraPrivate { + CcItem* root; + gdouble zoom; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_CAMERA, struct CcCameraPrivate)) + +/* * FIXME + * SECTION:camera + * + * + */ + +CcItem* +cc_camera_new(void) +{ + return cc_camera_new_root(NULL); +} + +CcItem* +cc_camera_new_root(CcItem* root) +{ + //g_warning("CcCamera is not implemented completely yet. Feel free to complete it."); + return g_object_new(CC_TYPE_CAMERA, "root", root, NULL); +} + +void +cc_camera_set_root(CcCamera* self, + CcItem * root) +{ + g_return_if_fail(CC_IS_CAMERA(self)); + g_return_if_fail(!root || CC_IS_ITEM(root)); + + if(P(self)->root == root) { + return; + } + + if(P(self)->root) { + cc_item_view_unregister(CC_ITEM_VIEW(self), P(self)->root); + g_object_unref(P(self)->root); + P(self)->root = NULL; + } + + if(root) { + P(self)->root = g_object_ref(root); + cc_item_view_register(CC_ITEM_VIEW(self), P(self)->root); + } + + g_object_notify(G_OBJECT(self), "root"); +} + +CcItem* +cc_camera_get_root(CcItem const* self) +{ + return NULL; +} + +/* GType */ +enum { + PROP_0, + PROP_FOCUS, + PROP_MODE, + PROP_ROOT, + PROP_SCROLL, + PROP_ZOOM +}; +static void camera_implement_view(CcViewIface* iface); +static void camera_implement_item_view(CcItemViewIface* iface); +G_DEFINE_TYPE_WITH_CODE(CcCamera, cc_camera, CC_TYPE_ITEM, + G_IMPLEMENT_INTERFACE (CC_TYPE_ITEM_VIEW, camera_implement_item_view); + G_IMPLEMENT_INTERFACE(CC_TYPE_VIEW, camera_implement_view)); + +static void +cc_camera_init(CcCamera* self G_GNUC_UNUSED) +{} + +static void +camera_dispose(GObject* object) +{ + if(P(object)->root) { + cc_camera_set_root(CC_CAMERA(object), NULL); + } + + if(G_OBJECT_CLASS(cc_camera_parent_class)->dispose) { + G_OBJECT_CLASS(cc_camera_parent_class)->dispose(object); + } +} + +static void +camera_get_property() +{ + g_warning("FIXME: implement %s", __PRETTY_FUNCTION__); +} + +static void +camera_set_zoom(CcCamera* self, + gdouble zoom) +{ + if(P(self)->zoom == zoom) { + return; + } + + P(self)->zoom = zoom; + g_object_notify(G_OBJECT(self), "zoom"); + // FIXME: queue draw +} + +static void +camera_set_property(GObject * object, + guint prop_id, + GValue const* value, + GParamSpec * pspec) +{ + switch(prop_id) { + case PROP_FOCUS: + g_warning("Implement 'focus' for CcCamera"); + break; + case PROP_MODE: + g_warning("Implement 'zoom-mode' for CcCamera"); + break; + case PROP_ROOT: + cc_camera_set_root(CC_CAMERA(object), g_value_get_object(value)); + break; + case PROP_SCROLL: + g_warning("Implement 'scrolled-region' for CcCamera"); + break; + case PROP_ZOOM: + camera_set_zoom(CC_CAMERA(object), g_value_get_double(value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static void +camera_render(CcItem * item, + CcView * view, + cairo_t* cr) +{ + cairo_surface_t* surface; + cairo_t * surface_cr; + + if(CC_ITEM_CLASS(cc_camera_parent_class)->render) { + CC_ITEM_CLASS(cc_camera_parent_class)->render(item, view, cr); + } + + if(!CC_IS_ITEM(P(item)->root)) { + return; + } + + surface = cairo_surface_create_similar(cairo_get_target(cr), + CAIRO_CONTENT_COLOR_ALPHA, + 100, 100); + surface_cr = cairo_create(surface); + cairo_save(surface_cr); + cairo_rectangle(surface_cr, 0.0, 0.0, 101.0, 101.0); + cairo_set_source_rgba(surface_cr, 0.0, 0.0, 0.0, 0.5); + cairo_fill(surface_cr); + cc_item_render(P(item)->root, CC_VIEW(item), surface_cr); + cairo_restore(surface_cr); + cairo_destroy(surface_cr); + + cairo_save(cr); + cairo_set_source_surface(cr, surface, 0.0, 0.0); + cairo_rectangle(cr, 0.0, 0.0, 101.0, 101.0); + cairo_clip(cr); + cairo_paint_with_alpha(cr, 0.5); + cairo_restore(cr); + + cairo_surface_destroy(surface); +} + +static void +cc_camera_class_init(CcCameraClass* self_class) +{ + GObjectClass* object_class = G_OBJECT_CLASS(self_class); + CcItemClass * item_class = CC_ITEM_CLASS(self_class); + + /* GObjectClass */ + object_class->dispose = camera_dispose; + object_class->get_property = camera_get_property; + object_class->set_property = camera_set_property; + + _cc_view_install_property(object_class, + PROP_ROOT, PROP_SCROLL, + PROP_ZOOM, PROP_MODE, + PROP_FOCUS); + + /* CcItemClass */ + item_class->render = camera_render; + + /* CcCameraClass */ + g_type_class_add_private(self_class, sizeof(struct CcCameraPrivate)); +} + +/* CcViewIface */ +static void +camera_init_matrix(CcCamera* self, cairo_matrix_t* matrix) +{ + cairo_matrix_init_translate(matrix, 0.0, 0.0); + cairo_matrix_init_scale(matrix, P(self)->zoom, P(self)->zoom); +} + +static void +camera_world_to_window(CcView const* view, + gdouble * x, + gdouble * y) +{ + cairo_matrix_t matrix; + gdouble real_x = x ? *x : 0.0, + real_y = y ? *y : 0.0; + + camera_init_matrix(CC_CAMERA(view), &matrix); + cairo_matrix_transform_point(&matrix, &real_x, &real_y); + + if(x) { + *x = real_x; + } + if(y) { + *y = real_y; + } +} + +static void +camera_world_to_window_distance(CcView const* view, + gdouble * x, + gdouble * y) +{ + cairo_matrix_t matrix; + gdouble real_x = x ? *x : 0.0, + real_y = y ? *y : 0.0; + camera_init_matrix(CC_CAMERA(view), &matrix); + cairo_matrix_transform_distance(&matrix, &real_x, &real_y); + if(x) { + *x = real_x; + } + if(y) { + *y = real_y; + } +} + +static void +camera_implement_view(CcViewIface* iface) +{ + iface->world_to_window = camera_world_to_window; + iface->world_to_window_distance = camera_world_to_window_distance; +} + +/* CcItemViewIface */ +/* IMPLEMENTATION NOTE: + * CcCamera inherits from CcItem. So it already implements CcItemView. This is + * the desired behavior but leads to a simple problem: + * + * When the bounding box of the root changes, the default implementation for + * "child-bounds-changed" gets called. As this behavior isn't desired for the + * root item, we filter out the root item from the forwarded calls here: + * + * if (child != root) { + * default_implementation (); + * } else { + * camera_implementation (); + * } + */ +static void +camera_item_added (CcItemView* iview, + CcItem * item, + gint position, + CcItem * child) +{ + if (CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->item_added) { + CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->item_added (iview, item, position, child); + } +} + +static void +camera_item_removed (CcItemView* iview, + CcItem * item, + gint position, + CcItem * child) +{ + if (CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->item_removed) { + CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->item_removed (iview, item, position, child); + } +} + +static void +camera_item_dirty (CcItemView * iview, + CcItem * item, + CcView const * view, + CcDRect const* dirty) +{ + if (CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->item_dirty) { + CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->item_dirty (iview, item, view, dirty); + } +} + +static void +camera_notify_all_bounds (CcItemView * iview, + CcItem * item, + CcView * view, + CcDRect const* all_bounds) +{ + if (G_LIKELY (CC_IS_CAMERA (view) && CC_CAMERA (iview) == CC_CAMERA (view) && item == P(iview)->root)) { + // it's the root item + } else if (CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->notify_all_bounds) { + CC_ITEM_VIEW_IFACE (cc_camera_parent_class)->notify_all_bounds (iview, item, view, all_bounds); + } +} + +static void +camera_implement_item_view(CcItemViewIface* iface) +{ + iface->item_added = camera_item_added; + iface->item_removed = camera_item_removed; + iface->item_dirty = camera_item_dirty; + iface->notify_all_bounds = camera_notify_all_bounds; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-camera.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-camera.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-camera.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-camera.h 2007-05-05 15:00:43.000000000 +0100 @@ -0,0 +1,50 @@ +/* This file is part of CCC, a cairo-based canvas + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_CAMERA_H +#define CC_CAMERA_H + +#include + +G_BEGIN_DECLS + +typedef CcItem CcCamera; +typedef CcItemClass CcCameraClass; + +#define CC_TYPE_CAMERA (cc_camera_get_type()) +#define CC_CAMERA(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_CAMERA, CcCamera)) +#define CC_CAMERA_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_CAMERA, CcCameraClass)) +#define CC_IS_CAMERA(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_CAMERA)) +#define CC_IS_CAMERA_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_CAMERA)) +#define CC_CAMERA_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_CAMERA, CcCameraClass)) + +GType cc_camera_get_type(void); +CcItem* cc_camera_new (void); +CcItem* cc_camera_new_root(CcItem * root); +void cc_camera_set_root(CcCamera * self, + CcItem * root); +CcItem* cc_camera_get_root(CcItem const* self); + +G_END_DECLS + +#endif /* !CC_CAMERA_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-caret.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-caret.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-caret.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-caret.c 2006-12-03 17:27:28.000000000 +0000 @@ -0,0 +1,67 @@ +/* This file is part of CCC, a cairo-based canvas + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-caret.h" + +CcItem* +cc_caret_new(void) +{ + return g_object_new(CC_TYPE_CARET, NULL); +} + +void +cc_caret_set_position(CcCaret* self, + gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2) +{ + CcLine* line = CC_LINE(self); + gdouble height = y2 - y1; + gdouble delta = 0.125*height; + gdouble coords[][2] = { + {x1 - delta, y1}, + {x1 + delta, y1}, + {x1, y1 + delta}, + {x2, y2 - delta}, + {x2 + delta, y2}, + {x2 - delta, y2} + }; + guint i; + cc_line_clear(line); + for(i = 0; i < G_N_ELEMENTS(coords); i++) { + cc_line_line(line, coords[i][0], coords[i][1]); + } +} + +/* GType */ +G_DEFINE_TYPE(CcCaret, cc_caret, CC_TYPE_LINE); + +static void +cc_caret_init(CcCaret* self G_GNUC_UNUSED) +{} + +static void +cc_caret_class_init(CcCaretClass* self_class G_GNUC_UNUSED) +{} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-caret.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-caret.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-caret.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-caret.h 2006-12-03 17:08:09.000000000 +0000 @@ -0,0 +1,51 @@ +/* This file is part of CCC, a cairo-based canvas + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_CARET_H +#define CC_CARET_H + +#include + +G_BEGIN_DECLS + +typedef CcLine CcCaret; +typedef CcLineClass CcCaretClass; + +#define CC_TYPE_CARET (cc_caret_get_type()) +#define CC_CARET(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_CARET, CcCaret)) +#define CC_CARET_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_CARET, CcCaretClass)) +#define CC_IS_CARET(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_CARET)) +#define CC_IS_CARET_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_CARET)) +#define CC_CARET_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_CARET, CcCaretClass)) + +GType cc_caret_get_type (void); +CcItem* cc_caret_new (void); +void cc_caret_set_position(CcCaret* self, + gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); + +G_END_DECLS + +#endif /* !CC_CARET_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/ccc.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/ccc.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/ccc.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/ccc.h 2007-05-05 14:50:43.000000000 +0100 @@ -26,19 +26,26 @@ #include #include +#include +#include +#include #include #include #include +#include #include #include #include #include +#include #include #include +#include #include #include #include #include +#include #include #include #include diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-circle.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-circle.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-circle.c 2006-06-29 13:14:38.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-circle.c 2007-05-05 22:05:23.000000000 +0100 @@ -46,27 +46,34 @@ g_object_notify(G_OBJECT(self), "anchor"); } +/** + * cc_circle_set_radius: + * @self: a #CcCircle + * @radius: the new radius + * + * Specifies the radius of the circle. + */ void -cc_circle_set_radius(CcCircle* self, gdouble radius) { - CcDRect dirty; +cc_circle_set_radius (CcCircle* self, + gdouble radius) +{ CcItem* item; g_return_if_fail(CC_IS_CIRCLE(self)); + item = CC_ITEM(self); + if(self->radius == radius) { return; } - item = CC_ITEM(self); - dirty.x1 = self->x - MAX(radius, self->radius); - dirty.y1 = self->y - MAX(radius, self->radius); - dirty.x2 = self->x + MAX(radius, self->radius); - dirty.y2 = self->y + MAX(radius, self->radius); self->radius = radius; - g_object_notify(G_OBJECT(self), "radius"); - cc_item_dirty(item, NULL, dirty); - cc_item_update_bounds(item, NULL); + cc_item_repaint (item); + cc_item_update_bounds (item, NULL); + cc_item_repaint (item); + + g_object_notify (G_OBJECT(self), "radius"); } /* GType */ @@ -112,12 +119,17 @@ } static gdouble -cc_distance(CcItem* item, gdouble x, gdouble y, CcItem** found) { +cc_distance (CcItem * item, + CcView const* view, + gdouble x, + gdouble y, + CcItem **found) +{ gdouble distance = 0.0; CcCircle* self = NULL; // search the children first - distance = CC_ITEM_CLASS(cc_circle_parent_class)->distance(item, x, y, found); + distance = CC_ITEM_CLASS(cc_circle_parent_class)->distance(item, view, x, y, found); if(*found) { return distance; @@ -126,7 +138,7 @@ self = CC_CIRCLE(item); distance = sqrt(pow(x - self->x, 2.0) + pow(y - self->y, 2)); - if(distance <= self->radius + 0.5 * CC_SHAPE(self)->width) { + if(distance <= self->radius + 0.5 * cc_shape_get_width (CC_SHAPE (self), view)) { distance = 0.0; *found = item; } else { @@ -139,7 +151,7 @@ static void cc_update_bounds(CcItem* item, CcView const* view, gpointer data) { CcCircle* self = CC_CIRCLE(item); - gdouble w_2 = 0.5 * CC_SHAPE(self)->width; + gdouble w_2 = 0.5 * cc_shape_get_width (CC_SHAPE (self), view); CcDRect new_bounds = { self->x - self->radius - w_2, self->y - self->radius - w_2, diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color.c 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color.c 2007-04-20 09:39:56.000000000 +0100 @@ -23,16 +23,63 @@ #include +#include + G_DEFINE_TYPE(CcColor, cc_color, G_TYPE_INITIALLY_UNOWNED); +/** + * cc_color_apply: + * @self: a #CcColor + * @red: target for red component + * @green: target for green component + * @blue: target for blue component + * @alpha: target for alpha value + * + * Initializes @red, @green, @blue and @alpha to represent the color specified + * by @self: + */ +void +cc_color_apply(CcColor const* self, + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha) +{ + g_return_if_fail(CC_IS_COLOR(self)); + g_return_if_fail(red && green && blue && alpha); + + cc_return_if_unimplemented_code(CC_COLOR_GET_CLASS(self), apply, + *red = *green = *blue = *alpha = 0.0); + + CC_COLOR_GET_CLASS(self)->apply(self, red, green, blue, alpha); +} + +/** + * cc_color_stop: + * @self: a #CcColor + * @pattern: a #cairo_pattern_t + * @offset: [0.0..1.0] + * + * Specify a color stop in @pattern at @offset with the color of @self. + */ void -cc_color_apply(CcColor* self, cairo_t* cr) { +cc_color_stop(CcColor const * self, + cairo_pattern_t* pattern, + gdouble offset) +{ + gdouble red, + green, + blue, + alpha; + g_return_if_fail(CC_IS_COLOR(self)); - g_return_if_fail(cr); + g_return_if_fail(cairo_pattern_status(pattern) == CAIRO_STATUS_SUCCESS); - g_return_if_fail(CC_COLOR_GET_CLASS(self)->apply); + cc_color_apply(self, &red, &green, &blue, &alpha); - CC_COLOR_GET_CLASS(self)->apply(self, cr); + cairo_pattern_add_color_stop_rgba(pattern, offset, + red, green, + blue, alpha); } /* CcColor */ @@ -74,6 +121,16 @@ } static void +color_apply(CcColor const* self, + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha) +{ + *alpha = self->alpha; +} + +static void cc_color_class_init(CcColorClass* self_class) { GObjectClass* go_class = G_OBJECT_CLASS(self_class); go_class->get_property = cc_get_property; @@ -87,5 +144,7 @@ 0.0, 1.0, 1.0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + self_class->apply = color_apply; } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color.h 2007-04-24 22:15:27.000000000 +0100 @@ -32,6 +32,9 @@ typedef struct _CcColor CcColor; typedef struct _CcColorClass CcColorClass; +typedef CcColor CcColorHsv; +typedef CcColor CcColorRgb; + #define CC_TYPE_COLOR (cc_color_get_type()) #define CC_COLOR(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR, CcColor)) #define CC_COLOR_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_COLOR, CcColorClass)) @@ -39,10 +42,18 @@ #define CC_IS_COLOR_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_COLOR)) #define CC_COLOR_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_COLOR, CcColorClass)) -GType cc_color_get_type(void); - -void cc_color_apply (CcColor* self, - cairo_t* cr); +GType cc_color_get_type (void); +GType cc_color_hsv_get_type(void); +GType cc_color_rgb_get_type(void); + +void cc_color_apply (CcColor const * self, + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha); +void cc_color_stop (CcColor const * self, + cairo_pattern_t* pattern, + gdouble offset); CcColor* cc_color_new_rgb (gdouble red, gdouble green, gdouble blue); @@ -68,7 +79,10 @@ /* vtable */ void (*apply) (CcColor const* self, - cairo_t * cr); + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha); }; G_END_DECLS diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color-hsv.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color-hsv.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color-hsv.c 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color-hsv.c 2007-05-05 23:06:48.000000000 +0100 @@ -23,21 +23,20 @@ #include -GType cc_color_hsv_get_type(void); #define CC_TYPE_COLOR_HSV (cc_color_hsv_get_type()) -#define CC_COLOR_HSV(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR_HSV, CcColorHSV)) +#define CC_COLOR_HSV(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR_HSV, CcColorHsv)) -/* CcColorHSV */ -typedef struct { - CcColor base_instance; +/* CcColorHsv */ +struct CcColorHsvPrivate { gdouble hue; gdouble value; gdouble saturation; -} CcColorHSV; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_COLOR_HSV, struct CcColorHsvPrivate)) -typedef struct _CcColorClass CcColorHSVClass; +typedef struct _CcColorClass CcColorHsvClass; -G_DEFINE_TYPE(CcColorHSV, cc_color_hsv, CC_TYPE_COLOR); +G_DEFINE_TYPE(CcColorHsv, cc_color_hsv, CC_TYPE_COLOR); CcColor* cc_color_new_hsv(gdouble hue, gdouble saturation, gdouble value) { @@ -63,26 +62,24 @@ }; static void -cc_color_hsv_init(CcColorHSV* self) {} +cc_color_hsv_init(CcColorHsv* self) {} static void cch_get_property() {} static void cch_set_property(GObject* object, guint prop_id, GValue const* value, GParamSpec* pspec) { - CcColorHSV* self = CC_COLOR_HSV(object); - switch(prop_id) { case PROP_HUE: - self->hue = g_value_get_double(value); + P(object)->hue = g_value_get_double(value); g_object_notify(object, "hue"); break; case PROP_SATURATION: - self->saturation = g_value_get_double(value); + P(object)->saturation = g_value_get_double(value); g_object_notify(object, "saturation"); break; case PROP_VALUE: - self->value = g_value_get_double(value); + P(object)->value = g_value_get_double(value); g_object_notify(object, "value"); break; default: @@ -92,52 +89,55 @@ } static void -cch_apply(CcColor const* color, cairo_t* cr) { - CcColorHSV const* self = CC_COLOR_HSV(color); - gdouble r, g, b; - - if(self->saturation == 0.0) { - r = g = b = self->value; +color_hsv_apply(CcColor const* color, + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha) +{ + if(P(color)->saturation == 0.0) { + *red = *green = *blue = P(color)->value; } else { - gdouble hue = self->hue * 6.0, + gdouble hue = P(color)->hue * 6.0, f, p, q, t; if(hue >= 6.0) hue = 0.0; f = hue - (int)hue; - p = self->value * (1.0 - self->saturation); - q = self->value * (1.0 - self->saturation * f); - t = self->value * (1.0 - self->saturation * (1.0 - f)); + p = P(color)->value * (1.0 - P(color)->saturation); + q = P(color)->value * (1.0 - P(color)->saturation * f); + t = P(color)->value * (1.0 - P(color)->saturation * (1.0 - f)); switch((int)hue) { case 0: - r = self->value; g = t; b = p; + *red = P(color)->value; *green = t; *blue = p; break; case 1: - r = q; g = self->value; b = p; + *red = q; *green = P(color)->value; *blue = p; break; case 2: - r = p; g = self->value; b = t; + *red = p; *green = P(color)->value; *blue = t; break; case 3: - r = p; g = q; b = self->value; + *red = p; *green = q; *blue = P(color)->value; break; case 4: - r = t; g = p; b = self->value; + *red = t; *green = p; *blue = P(color)->value; break; case 5: - r = self->value; g = p; b = q; + *red = P(color)->value; *green = p; *blue = q; break; default: g_warning("hue should not be bigger than 5"); break; }; } - cairo_set_source_rgba(cr, r, g, b, color->alpha); + + CC_COLOR_CLASS(cc_color_hsv_parent_class)->apply(color, red, green, blue, alpha); } static void -cc_color_hsv_class_init(CcColorHSVClass* self_class) { +cc_color_hsv_class_init(CcColorHsvClass* self_class) { GObjectClass* go_class; CcColorClass* cc_class; @@ -173,6 +173,9 @@ /* CcColorClass */ cc_class = CC_COLOR_CLASS(self_class); - cc_class->apply = cch_apply; + cc_class->apply = color_hsv_apply; + + /* CcColorHsvClass */ + g_type_class_add_private(self_class, sizeof(struct CcColorHsvPrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color-rgb.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color-rgb.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-color-rgb.c 2006-06-13 12:02:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-color-rgb.c 2007-04-20 09:39:56.000000000 +0100 @@ -23,22 +23,19 @@ #include -GType cc_color_rgb_get_type(void); - #define CC_TYPE_COLOR_RGB (cc_color_rgb_get_type()) -#define CC_COLOR_RGB(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR_RGB, CcColorRGB)) +#define CC_COLOR_RGB(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR_RGB, CcColorRgb)) -/* CcColorRGB */ -typedef struct { - CcColor base_instance; +struct CcColorRgbPrivate { gdouble red; gdouble green; gdouble blue; -} CcColorRGB; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_COLOR_RGB, struct CcColorRgbPrivate)) -typedef struct _CcColorClass CcColorRGBClass; +typedef CcColorClass CcColorRgbClass; -G_DEFINE_TYPE(CcColorRGB, cc_color_rgb, CC_TYPE_COLOR); +G_DEFINE_TYPE(CcColorRgb, cc_color_rgb, CC_TYPE_COLOR); CcColor* cc_color_new_rgb(gdouble red, gdouble green, gdouble blue) { @@ -64,21 +61,19 @@ }; static void -cc_color_rgb_init(CcColorRGB* self) {} +cc_color_rgb_init(CcColorRgb* self) {} static void ccr_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec) { - CcColorRGB* self = CC_COLOR_RGB(object); - switch(prop_id) { case PROP_BLUE: - g_value_set_double(value, self->blue); + g_value_set_double(value, P(object)->blue); break; case PROP_GREEN: - g_value_set_double(value, self->green); + g_value_set_double(value, P(object)->green); break; case PROP_RED: - g_value_set_double(value, self->red); + g_value_set_double(value, P(object)->red); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -88,19 +83,17 @@ static void ccr_set_property(GObject* object, guint prop_id, GValue const* value, GParamSpec* pspec) { - CcColorRGB* self = CC_COLOR_RGB(object); - switch(prop_id) { case PROP_BLUE: - self->blue = g_value_get_double(value); + P(object)->blue = g_value_get_double(value); g_object_notify(object, "blue"); break; case PROP_GREEN: - self->green = g_value_get_double(value); + P(object)->green = g_value_get_double(value); g_object_notify(object, "green"); break; case PROP_RED: - self->red = g_value_get_double(value); + P(object)->red = g_value_get_double(value); g_object_notify(object, "red"); break; default: @@ -110,13 +103,21 @@ } static void -ccr_apply(CcColor const* color, cairo_t* cr) { - CcColorRGB const* self = CC_COLOR_RGB(color); - cairo_set_source_rgba(cr, self->red, self->green, self->blue, color->alpha); +color_rgb_apply(CcColor const* color, + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha) +{ + *red = P(color)->red; + *green = P(color)->green; + *blue = P(color)->blue; + + CC_COLOR_CLASS(cc_color_rgb_parent_class)->apply(color, red, green, blue, alpha); } static void -cc_color_rgb_class_init(CcColorRGBClass* self_class) { +cc_color_rgb_class_init(CcColorRgbClass* self_class) { GObjectClass* go_class; CcColorClass* cc_class; @@ -155,6 +156,8 @@ /* CcColorClass */ cc_class = CC_COLOR_CLASS(self_class); - cc_class->apply = ccr_apply; + cc_class->apply = color_rgb_apply; + + g_type_class_add_private(self_class, sizeof(struct CcColorRgbPrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-d-rect.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-d-rect.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-d-rect.c 2006-06-13 12:02:16.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-d-rect.c 2007-04-20 09:44:43.000000000 +0100 @@ -26,7 +26,7 @@ #include "gobject-helpers.h" CcDRect* -cc_d_rect_copy(CcDRect* one) { +cc_d_rect_copy(CcDRect const* one) { CcDRect* eva; g_return_val_if_fail(one, NULL); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-d-rect.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-d-rect.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-d-rect.h 2006-06-13 12:02:16.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-d-rect.h 2007-04-20 09:44:43.000000000 +0100 @@ -28,13 +28,18 @@ G_BEGIN_DECLS -typedef struct _CcDRect CcDRect; +typedef struct { + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; +} CcDRect; #define CC_TYPE_D_RECT (cc_d_rect_get_type()) GType cc_d_rect_get_type(void); -CcDRect* cc_d_rect_copy (CcDRect* one); +CcDRect* cc_d_rect_copy (CcDRect const* one); gboolean cc_d_rect_equal (CcDRect one, CcDRect two); gboolean cc_d_rect_intersect(CcDRect one, @@ -43,13 +48,6 @@ CcDRect two, CcDRect* merged); -struct _CcDRect { - gdouble x1; - gdouble y1; - gdouble x2; - gdouble y2; -}; - G_END_DECLS #endif /* !CC_D_RECT_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-enumerations.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-enumerations.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-enumerations.c 2006-07-14 17:27:59.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-enumerations.c 2007-05-05 16:30:06.000000000 +0100 @@ -26,6 +26,24 @@ return etype; } +/* enumerations from "cc-unit.h" */ +#include "cc-unit.h" +GType +cc_unit_get_type(void) { + static GType etype = 0; + if(!etype) { + static const GEnumValue values[] = { + {CC_UNIT_DISPLAY_PIXEL, "CC_UNIT_DISPLAY_PIXEL", N_("display-pixel")}, + {CC_UNIT_POINT, "CC_UNIT_POINT", N_("point")}, + {CC_UNIT_PT, "CC_UNIT_PT", N_("pt")}, + {0, NULL, NULL} + }; + + etype = g_enum_register_static("CcUnit", values); + } + + return etype; +} /* enumerations from "cc-utils.h" */ #include "cc-utils.h" GType diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-enumerations.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-enumerations.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-enumerations.h 2006-06-13 12:19:03.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-enumerations.h 2007-05-05 16:30:06.000000000 +0100 @@ -11,9 +11,15 @@ /* enumerations from "cc-item.h" */ GType cc_item_flags_get_type (void); #define CC_TYPE_ITEM_FLAGS (cc_item_flags_get_type()) + +/* enumerations from "cc-unit.h" */ +GType cc_unit_get_type (void); +#define CC_TYPE_UNIT (cc_unit_get_type()) + /* enumerations from "cc-utils.h" */ GType cc_zoom_mode_get_type (void); #define CC_TYPE_ZOOM_MODE (cc_zoom_mode_get_type()) + G_END_DECLS #endif /* !CC_ENUMERATIONS_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-enumerations.h.in /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-enumerations.h.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-enumerations.h.in 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-enumerations.h.in 2007-04-20 09:54:58.000000000 +0100 @@ -21,5 +21,6 @@ /*** BEGIN value-header ***/ GType @enum_name@_get_type (void); #define CC_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) + /*** END value-header ***/ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-gradient.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-gradient.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-gradient.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-gradient.c 2007-04-20 09:39:56.000000000 +0100 @@ -0,0 +1,138 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-gradient.h" + +#include + +struct CcGradientStop { + gdouble offset; + CcColor* color; +}; +struct CcGradientPrivate { + GSList* stops; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_GRADIENT, struct CcGradientPrivate)) + +static gint +gradient_compare_stops(struct CcGradientStop* first, + struct CcGradientStop* second) +{ + if(first->offset > second->offset) { + return 1; + } else if(first->offset < second->offset) { + return -1; + } + return 0; +} + +/** + * cc_gradient_add_stop: + * @self: a #CcGradient + * @offset: the offset of the color stop (in [0.0;1.0]) + * @color: the #CcColor for this stop + * + * Adds a color stop to a gradient. Color stops don't need to be inserted in + * order sorting happens automatically. + */ +void +cc_gradient_add_stop(CcGradient* self, + gdouble offset, + CcColor * color) +{ + struct CcGradientStop* stop; + + g_return_if_fail(CC_IS_GRADIENT(self)); + g_return_if_fail(0.0 <= offset && offset <= 1.0); + g_return_if_fail(CC_IS_COLOR(color)); + + stop = g_new0(struct CcGradientStop, 1); + stop->offset = offset; + stop->color = g_object_ref_sink(color); + P(self)->stops = g_slist_insert_sorted(P(self)->stops, stop, (GCompareFunc)gradient_compare_stops); + + // FIXME: emit a changed signal to update items +} + +/** + * cc_gradient_create_pattern: + * @self: a #CcGradient + * @view: a #CcView + * @item: a #CcItem + * + * Creates a #cairo_pattern_t for rendering a gradient on @item in @view. + * + * Returns a #cairo_pattern_t. + */ +cairo_pattern_t* +cc_gradient_create_pattern(CcGradient const* self, + CcView const * view, + CcItem const * item) +{ + g_return_val_if_fail(CC_GRADIENT_GET_CLASS(self)->create_pattern, NULL); + + return CC_GRADIENT_GET_CLASS(self)->create_pattern(self, view, item); +} + +/* GType */ +G_DEFINE_ABSTRACT_TYPE(CcGradient, cc_gradient, CC_TYPE_BRUSH); + +static void +cc_gradient_init(CcGradient* self G_GNUC_UNUSED) +{} + +static void +gradient_apply(CcBrush* brush, + CcView * view, + CcItem * item, + cairo_t* cr) +{ + cairo_pattern_t* pattern = cc_gradient_create_pattern(CC_GRADIENT(brush), view, item); + + if(G_LIKELY(pattern)) { + struct CcGradientStop* stop; + GSList* it; + for(it = P(brush)->stops; it; it = g_slist_next(it)) { + stop = it->data; + cc_color_stop(stop->color, pattern, stop->offset); + } + cairo_set_source(cr, pattern); + cairo_pattern_destroy(pattern); + } + else { + cairo_set_source_rgba(cr, 0.925, 0.16, 0.16, 1.0); + } +} + +static void +cc_gradient_class_init(CcGradientClass* self_class) +{ + CcBrushClass* brush_class = CC_BRUSH_CLASS(self_class); + + /* CcBrushClass */ + brush_class->apply = gradient_apply; + + /* CcGradientClass */ + g_type_class_add_private(self_class, sizeof(struct CcGradientPrivate)); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-gradient.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-gradient.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-gradient.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-gradient.h 2007-04-20 09:39:56.000000000 +0100 @@ -0,0 +1,61 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_GRADIENT_H +#define CC_GRADIENT_H + +#include +#include + +G_BEGIN_DECLS + +typedef CcBrush CcGradient; +typedef struct _CcGradientClass CcGradientClass; + +#define CC_TYPE_GRADIENT (cc_gradient_get_type()) +#define CC_GRADIENT(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_GRADIENT, CcGradient)) +#define CC_GRADIENT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_GRADIENT, CcGradientClass)) +#define CC_IS_GRADIENT(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_GRADIENT)) +#define CC_IS_GRADIENT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_GRADIENT)) +#define CC_GRADIENT_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_GRADIENT, CcGradientClass)) + +GType cc_gradient_get_type (void); +void cc_gradient_add_stop (CcGradient * self, + gdouble offset, + CcColor * color); +cairo_pattern_t* cc_gradient_create_pattern(CcGradient const* self, + CcView const * view, + CcItem const * item); + +struct _CcGradientClass { + CcBrushClass base_class; + + /* vtable */ + cairo_pattern_t* (*create_pattern)(CcGradient const* self, + CcView const * view, + CcItem const * item); +}; + +G_END_DECLS + +#endif /* !CC_GRADIENT_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-hash-map.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-hash-map.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-hash-map.c 2006-06-13 12:02:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-hash-map.c 2007-05-05 22:01:24.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2006 Sven Herzberg + * Copyright (C) 2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -22,13 +22,36 @@ */ #include "cc-hash-map.h" + #include "glib-helpers.h" +/** + * CcHashMap: + * + * A hash map object for CCC. + */ + +/** + * cc_hash_map_new: + * @content_type: a #GType for the content + * + * Create a new #CcHashMap that can hold items of the #GType @content_type. + * + * Returns a new #CcHashMap. + */ CcHashMap* cc_hash_map_new(GType content_type) { return g_object_new(CC_TYPE_HASH_MAP, "content", content_type, NULL); } +/** + * cc_hash_map_foreach: + * @self: a #CcHashMap + * @func: a #GHFunc + * @user_data: user_data for @func + * + * Execute a function on each item from a #CcHashMap. + */ void cc_hash_map_foreach(CcHashMap* self, GHFunc func, gpointer user_data) { g_return_if_fail(CC_IS_HASH_MAP(self)); @@ -36,15 +59,32 @@ g_hash_table_foreach(self->hash_table, func, user_data); } +/** + * cc_hash_map_insert: + * @self: a #CcHashMap + * @key: the key that will be used for inserting + * @data: the value to be inserted + * + * Inserts @value into @self (indexed by @key). + */ void -cc_hash_map_insert(CcHashMap* self, gpointer key, gpointer value) { +cc_hash_map_insert(CcHashMap* self, gpointer key, gpointer data) { g_return_if_fail(CC_IS_HASH_MAP(self)); - g_hash_table_insert(self->hash_table, key, value); + g_hash_table_insert(self->hash_table, key, data); // FIXME: add a destroy notification on the object - // FIXME: require an onbject first + // FIXME: require an object first } +/** + * cc_hash_map_lookup: + * @self: a #CcHashMap + * @key: a key + * + * Looks up the data for @key. + * + * Returns the data belonging to @key, %NULL if no data was found. + */ gpointer cc_hash_map_lookup(CcHashMap* self, gconstpointer key) { g_return_val_if_fail(CC_IS_HASH_MAP(self), NULL); @@ -52,6 +92,13 @@ return g_hash_table_lookup(self->hash_table, key); } +/** + * cc_hash_map_remove: + * @self: a #CcHashMap + * @key: a key + * + * Removes the data that was registered in @self with the index @key. + */ void cc_hash_map_remove(CcHashMap* self, gconstpointer key) { g_return_if_fail(CC_IS_HASH_MAP(self)); @@ -61,7 +108,7 @@ } /* GType */ -G_DEFINE_TYPE(CCHashMap, cc_hash_map, G_TYPE_OBJECT); +G_DEFINE_TYPE(CcHashMap, cc_hash_map, G_TYPE_OBJECT); enum { PROP_0, @@ -69,7 +116,7 @@ }; static void -cc_hash_map_init(CCHashMap* self) { +cc_hash_map_init(CcHashMap* self) { self->fundamental = G_TYPE_INVALID; self->content = G_TYPE_INVALID; } @@ -77,7 +124,7 @@ static GObject* mhm_constructor(GType type, guint n_params, GObjectConstructParam* params) { GObject* retval = G_OBJECT_CLASS(cc_hash_map_parent_class)->constructor(type, n_params, params); - CCHashMap* self = CC_HASH_MAP(retval); + CcHashMap* self = CC_HASH_MAP(retval); self->fundamental = G_TYPE_FUNDAMENTAL(self->content); self->hash_table = g_hash_table_new(g_direct_hash, g_direct_equal); return retval; @@ -85,7 +132,7 @@ static void mhm_finalize(GObject* object) { - CCHashMap* self = CC_HASH_MAP(object); + CcHashMap* self = CC_HASH_MAP(object); // FIXME: delete key/value pairs g_hash_table_destroy(self->hash_table); @@ -96,7 +143,7 @@ static void mhm_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec) { - CCHashMap* self = CC_HASH_MAP(object); + CcHashMap* self = CC_HASH_MAP(object); switch(prop_id) { case PROP_CONTENT: @@ -110,7 +157,7 @@ static void mhm_set_property(GObject* object, guint prop_id, GValue const* value, GParamSpec* pspec) { - CCHashMap* self = CC_HASH_MAP(object); + CcHashMap* self = CC_HASH_MAP(object); switch(prop_id) { case PROP_CONTENT: @@ -125,7 +172,7 @@ } static void -cc_hash_map_class_init(CCHashMapClass* self_class) { +cc_hash_map_class_init(CcHashMapClass* self_class) { GObjectClass* go_class; /* GObjectClass */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-hash-map.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-hash-map.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-hash-map.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-hash-map.h 2007-05-05 22:01:24.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2006 Sven Herzberg + * Copyright (C) 2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -28,42 +28,37 @@ G_BEGIN_DECLS -typedef struct _CCHashMap CCHashMap; -typedef struct _CCHashMapClass CCHashMapClass; -typedef struct _CCHashMap CcHashMap; +typedef struct _CcHashMap CcHashMap; +typedef GObjectClass CcHashMapClass; #define CC_TYPE_HASH_MAP (cc_hash_map_get_type()) -#define CC_HASH_MAP(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_HASH_MAP, CCHashMap)) -#define CC_HASH_MAP_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_HASH_MAP, CCHashMapClass)) +#define CC_HASH_MAP(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_HASH_MAP, CcHashMap)) +#define CC_HASH_MAP_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_HASH_MAP, CcHashMapClass)) #define CC_IS_HASH_MAP(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_HASH_MAP)) #define CC_IS_HASH_MAP_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_HASH_MAP)) -#define CC_HASH_MAP_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_HASH_MAP, CCHashMapClass)) +#define CC_HASH_MAP_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_HASH_MAP, CcHashMapClass)) GType cc_hash_map_get_type(void); -CcHashMap* cc_hash_map_new (GType content_type); -void cc_hash_map_insert(CCHashMap* self, - gpointer key, - gpointer data); -gpointer cc_hash_map_lookup(CcHashMap * self, - gconstpointer key); -void cc_hash_map_remove(CCHashMap* self, - gconstpointer key); -void cc_hash_map_foreach(CcHashMap* self, - GHFunc func, - gpointer user_data); +CcHashMap* cc_hash_map_new (GType content_type); +void cc_hash_map_insert (CcHashMap* self, + gpointer key, + gpointer data); +gpointer cc_hash_map_lookup (CcHashMap * self, + gconstpointer key); +void cc_hash_map_remove (CcHashMap* self, + gconstpointer key); +void cc_hash_map_foreach(CcHashMap* self, + GHFunc func, + gpointer user_data); -struct _CCHashMap { +struct _CcHashMap { GObject base_instance; GType fundamental; GType content; GHashTable* hash_table; }; -struct _CCHashMapClass { - GObjectClass base_class; -}; - G_END_DECLS #endif /* !CC_HASH_MAP_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item.c 2006-07-14 17:27:56.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item.c 2007-05-05 21:47:37.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005,2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -34,6 +34,36 @@ #include #include "glib-helpers.h" +/* Copied from glib/trunk/gobject/gtype.c: + * FIXME: report a bug against GLib to make these macros visible + * --------------8<------------ */ +/* The 2*sizeof(size_t) alignment here is borrowed from + * GNU libc, so it should be good most everywhere. + * It is more conservative than is needed on some 64-bit + * platforms, but ia64 does require a 16-byte alignment. + * The SIMD extensions for x86 and ppc32 would want a + * larger alignment than this, but we don't need to + * do better than malloc. + */ +#define STRUCT_ALIGNMENT (2 * sizeof (gsize)) +#define ALIGN_STRUCT(offset) \ + ((offset + (STRUCT_ALIGNMENT - 1)) & -STRUCT_ALIGNMENT) +/* --------------8<------------ */ + + +typedef struct { + CcHashMap* view_data; +} CcItemPrivate; + +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE ((i), CC_TYPE_ITEM, CcItemPrivate)) + +typedef struct { + CcDRect* all_bounds; + CcDRect* children_bounds; +} CcItemViewData; + +#define V(i,v) (CC_ITEM_GET_VIEW_DATA ((i), (v), CC_TYPE_ITEM, CcItemViewData)) + enum { ALL_BOUNDS_CHANGED, BUTTON_PRESS_EVENT, @@ -58,7 +88,7 @@ N_SIGNALS }; -guint cc_item_signals[N_SIGNALS] = {0}; +static guint cc_item_signals[N_SIGNALS] = {0}; static void ci_init_item_view(CcItemViewIface* iface); @@ -118,6 +148,35 @@ */ /** + * cc_item_class_add_view_data: + * @item_class: a #CcItemClass + * @view_data_size: the size to be allocated for the view data + * + * Registers the size of view data for a certain item class. See also + * . + */ +void +cc_item_class_add_view_data (gpointer item_class, + gsize view_data_size) +{ + CcItemClass* self_class; + + g_return_if_fail (CC_IS_ITEM_CLASS (item_class)); + + self_class = CC_ITEM_CLASS (item_class); + + if (G_OBJECT_CLASS_TYPE (self_class) != CC_TYPE_ITEM) { + CcItemClass* parent_class = g_type_class_peek_parent (self_class); + if (self_class->view_data_size != parent_class->view_data_size) { + g_warning ("cc_item_class_add_view_data() called multiple times for the same type"); + return; + } + } + + self_class->view_data_size = ALIGN_STRUCT(self_class->view_data_size) + view_data_size; +} + +/** * cc_item_new: * * Create a new #CcItem that can be used to group several items together. @@ -149,18 +208,35 @@ * * Registers a view at the item. The item and its children can now set up data * for this view. + * + * This function should not be called by application code. Use + * cc_item_view_register() instead. */ void -cc_item_add_view(CcItem* self, CcView* view) { +cc_item_add_view (CcItem* self, + CcView* view) +{ g_return_if_fail(CC_IS_ITEM(self)); g_return_if_fail(CC_IS_VIEW(view)); self->views = g_list_prepend(self->views, view); // FIXME: add a weak reference on the view, and then add a FIXME for // removal in _remove_view() +#warning "FIXME: register the memory for the view and implement quick-lookup for the last view that was looked for in CcHashMap" g_signal_emit(self, cc_item_signals[VIEW_REGISTER], 0, view); } +/** + * cc_item_remove_view: + * @self: a #CcItem + * @view: a #CcView + * + * Unregisters a view at the item. The item and the children can now free data + * kept for this view. + * + * This function should not be called by application code. Use + * cc_item_view_unregister() instead. + */ void cc_item_remove_view(CcItem* self, CcView* view) { g_return_if_fail(CC_IS_ITEM(self)); @@ -174,28 +250,28 @@ static void ci_update_all_bounds(CcView const* view, CcItem* self) { - CcDRect const* all_bounds = cc_item_get_all_bounds(self, view); - CcDRect const* bounds = cc_hash_map_lookup(self->bounds, view); - CcDRect const* children_bounds = cc_hash_map_lookup(self->children_bounds, view); + CcItemViewData* view_data = V(self, view); + CcDRect const* bounds = cc_hash_map_lookup(self->bounds, view); g_return_if_fail(CC_IS_VIEW(view)); - if(G_UNLIKELY(!bounds && !children_bounds && all_bounds)) { - cc_hash_map_remove(self->all_bounds, self); + if(G_UNLIKELY(!bounds && !view_data->children_bounds && view_data->all_bounds)) { + g_free (view_data->all_bounds); + view_data->all_bounds = NULL; g_signal_emit(self, cc_item_signals[ALL_BOUNDS_CHANGED], 0, view, NULL); - } else if(G_LIKELY(bounds || children_bounds)) { + } else if(G_LIKELY(bounds || view_data->children_bounds)) { CcDRect new_bounds; - if(bounds && children_bounds) { - cc_d_rect_union(*bounds, *children_bounds, &new_bounds); + if(bounds && view_data->children_bounds) { + cc_d_rect_union(*bounds, *view_data->children_bounds, &new_bounds); } else if(bounds) { new_bounds = *bounds; } else { - new_bounds = *children_bounds; + new_bounds = *view_data->children_bounds; } - if(!all_bounds || !cc_d_rect_equal(*all_bounds, new_bounds)) { - cc_hash_map_remove(self->all_bounds, view); - cc_hash_map_insert(self->all_bounds, (gpointer)view, cc_d_rect_copy(&new_bounds)); + if(!view_data->all_bounds || !cc_d_rect_equal(*view_data->all_bounds, new_bounds)) { + g_free (view_data->all_bounds); + view_data->all_bounds = cc_d_rect_copy (&new_bounds); g_signal_emit(self, cc_item_signals[ALL_BOUNDS_CHANGED], 0, view, &new_bounds); } } @@ -209,12 +285,36 @@ ci_update_all_bounds(view, self); } +static void +item_repaint_cb (CcItem* item, + CcView* view) +{ + CcDRect* bounds = cc_hash_map_lookup (item->bounds, view); + + if (bounds) { + cc_item_dirty (item, view, *bounds); + } +} + +/** + * cc_item_repaint: + * @self: a #CcItem + * + * Request a redraw operation for all the views. + */ +void +cc_item_repaint (CcItem* item) +{ + cc_item_foreach_view (item, CC_ITEM_FUNC (item_repaint_cb), NULL); +} + /** * cc_item_dirty: * @self: a #CcItem + * @view: a #CcView * @dirty_region: the region that needs to be redrawn * - * Let emit a signal to tell all the views that it needs to be redrawn. + * Let emit a signal to tell @view that it needs to be redrawn. */ void cc_item_dirty(CcItem* self, CcView const* view, CcDRect dirty_region) { @@ -224,6 +324,7 @@ /** * cc_item_distance: * @self: a #CcItem + * @view: a #CcView * @x: the x coordinate to query for * @y: the y coordinate to query for * @found: the return location for a found #CcItem @@ -234,19 +335,30 @@ * Returns the distance between @self (or one of its children) to (@x,@y). */ gdouble -cc_item_distance(CcItem* self, gdouble x, gdouble y, CcItem** found) { +cc_item_distance (CcItem * self, + CcView const* view, + gdouble x, + gdouble y, + CcItem **found) +{ gdouble distance = 0.0; g_return_val_if_fail(CC_IS_ITEM(self), G_MAXDOUBLE); g_return_val_if_fail(CC_ITEM_GET_CLASS(self)->distance, G_MAXDOUBLE); g_return_val_if_fail(found, G_MAXDOUBLE); g_return_val_if_fail(!CC_IS_ITEM(*found), G_MAXDOUBLE); - distance = CC_ITEM_GET_CLASS(self)->distance(self, x, y, found); -#if 1 + distance = CC_ITEM_GET_CLASS(self)->distance(self, view, x, y, found); + +#ifndef G_DISABLE_CHECKS // enable this on experimental builds, but not on performance builds if(distance <= 0.0 && !CC_IS_ITEM(*found)) { - g_warning("%sClass->distance() should set *found", G_OBJECT_TYPE_NAME(self)); + g_warning("%sClass->distance() should set *found if the returned distance is <= 0.0", + G_OBJECT_TYPE_NAME(self)); *found = self; + } else if(distance > 0 && CC_IS_ITEM(*found)) { + g_warning("%sClass->distance() should not set *found if distance is larger than 0.0", + G_OBJECT_TYPE_NAME(self)); + *found = NULL; } #endif @@ -273,9 +385,10 @@ /** * cc_item_get_all_bounds: - * @self: a #CriaItem + * @self: a #CcItem + * @view: a #CcView * - * Get the bounds of @self (including all of its children). + * Get the bounds of @self as it would e displayed by @view (including all of its children). * * Returns the bounds of the item, may be %NULL (in this case the item is not * tied visible area). @@ -285,7 +398,45 @@ g_return_val_if_fail(CC_IS_ITEM(self), NULL); g_return_val_if_fail(CC_IS_VIEW(view), NULL); - return cc_hash_map_lookup(self->all_bounds, view); + return V(self, view)->all_bounds; +} + +/** + * cc_item_get_view_data: + * @self: a #CcItem + * @type: the #GType of @self which should be searched for the view + * @view: a #CcView + * + * Get a pointer to the view data for @view in @self. See also + * . + * + * Returns a pointer to the requested memory. + */ +gpointer +cc_item_get_view_data (CcItem const* self, + CcView const* view, + GType self_type) +{ + gpointer view_data = NULL; + + g_return_val_if_fail (CC_IS_ITEM (self), NULL); + g_return_val_if_fail (CC_IS_VIEW (view), NULL); + g_return_val_if_fail (g_type_is_a (self_type, CC_TYPE_ITEM), NULL); + + cdebug ("get_view_data()", "for %s in %s", + G_OBJECT_TYPE_NAME (view), + G_OBJECT_TYPE_NAME (self)); + view_data = cc_hash_map_lookup (P(self)->view_data, view); + + if (G_UNLIKELY (!view_data)) { + g_warning ("Didn't find data for view %p (%s) in %p (%s).", + view, G_OBJECT_TYPE_NAME (view), + self, G_OBJECT_TYPE_NAME (self)); + } else if (self_type != CC_TYPE_ITEM) { + CcItemClass* parent_class = g_type_class_peek_parent (CC_ITEM_GET_CLASS (self)); + view_data = ((gchar*)view_data) + ALIGN_STRUCT (parent_class->view_data_size); + } + return view_data; } void @@ -330,10 +481,13 @@ self->children = g_list_insert(self->children, g_object_ref_sink(child), position); child->parent = self; - cc_item_view_register(CC_ITEM_VIEW(self), child); position = g_list_index(self->children, child); cc_item_foreach_view(self, ci_add_parent_view_to_child, child); + // FIXME: let's have a test case that makes sure that the views are registered before + // the item registers with the child + cc_item_view_register(CC_ITEM_VIEW(self), child); + g_signal_emit(self, cc_item_signals[ITEM_ADDED], 0, position, child); } @@ -462,6 +616,133 @@ ci_update_bounds_per_view(view, self_and_data); } +static void +ci_update_view(CcItem* self, CcView* view, gpointer data) { + CcDRect const *dirty_region = cc_item_get_all_bounds(self, view); + g_return_if_fail(dirty_region != NULL); + cc_item_dirty(self, view, *dirty_region); +} + +/** + * cc_item_set_position: + * @child: a #CcItem + * @parent: another #CcItem, parent of @child + * @position: the new position of the #CcItem (0 means at the bottom, + * bigger numbers mean higher layers, -1 means top layer) + * + * Changes the position of @child relative to @parent. + */ +void +cc_item_set_position(CcItem* child, CcItem* parent, gint position) +{ + g_return_if_fail(CC_IS_ITEM(child)); + g_return_if_fail(CC_IS_ITEM(parent)); + g_return_if_fail(cc_item_is_child_of(child, parent)); + + parent->children = g_list_remove(parent->children, child); + parent->children = g_list_insert(parent->children, child, position); + cc_item_foreach_view(child, ci_update_view, NULL); +} + +/** + * cc_item_raise_to_top: + * @child: a #CcItem + * @parent: another #CcItem, parent of @child + * + * Raises an @child to the top. It will be displayed over all of the other + * children of @parent. + */ +void +cc_item_raise_to_top(CcItem* child, CcItem* parent) +{ + g_return_if_fail(CC_IS_ITEM(child)); + g_return_if_fail(CC_IS_ITEM(parent)); + g_return_if_fail(cc_item_is_child_of(child, parent)); + + if(child == CC_ITEM(g_list_last(parent->children)->data)) { + return; + } + + parent->children = g_list_remove(parent->children, child); + parent->children = g_list_append(parent->children, child); + cc_item_foreach_view(child, ci_update_view, NULL); +} + +/** + * cc_item_raise: + * @child: a #CcItem + * @parent: another #CcItem, parent of @child + * + * Raises @child by one level. + */ +void +cc_item_raise(CcItem* child, CcItem* parent) +{ + gint position; + + g_return_if_fail(CC_IS_ITEM(child)); + g_return_if_fail(CC_IS_ITEM(parent)); + g_return_if_fail(cc_item_is_child_of(child, parent)); + + if(child == CC_ITEM(g_list_last(parent->children)->data)) { + return; + } + + position = g_list_index(parent->children, child); + parent->children = g_list_remove(parent->children, child); + parent->children = g_list_insert(parent->children, child, position+1); + cc_item_foreach_view(child, ci_update_view, NULL); +} + +/** + * cc_item_lower: + * @child: a #CcItem + * @parent: another #CcItem, parent of @child + * + * Lowers @child by one level. + */ +void +cc_item_lower(CcItem* child, CcItem* parent) +{ + gint position; + + g_return_if_fail(CC_IS_ITEM(child)); + g_return_if_fail(CC_IS_ITEM(parent)); + g_return_if_fail(cc_item_is_child_of(child, parent)); + + if(child == CC_ITEM(parent->children->data)) { + return; + } + + position = g_list_index(parent->children, child); + parent->children = g_list_remove(parent->children, child); + parent->children = g_list_insert(parent->children, child, position-1); + cc_item_foreach_view(child, ci_update_view, NULL); +} + +/** + * cc_item_lower_to_bottom: + * @child: a #CcItem + * @parent: another #CcItem, parent of @child + * + * Lowers @child to be displayed behind all the other children of @parent. + */ +void +cc_item_lower_to_bottom(CcItem* child, CcItem* parent) +{ + g_return_if_fail(CC_IS_ITEM(child)); + g_return_if_fail(CC_IS_ITEM(parent)); + g_return_if_fail(cc_item_is_child_of(child, parent)); + + if(child == CC_ITEM(parent->children->data)) { + return; + } + + parent->children = g_list_remove(parent->children, child); + parent->children = g_list_prepend(parent->children, child); + cc_item_foreach_view(child, ci_update_view, NULL); +} + /* GType stuff */ enum { PROP_0, @@ -474,9 +755,8 @@ cc_item_init(CcItem* self) { self->parent = NULL; - self->all_bounds = cc_hash_map_new(CC_TYPE_D_RECT); + P(self)->view_data = cc_hash_map_new (G_TYPE_POINTER); self->bounds = cc_hash_map_new(CC_TYPE_D_RECT); - self->children_bounds = cc_hash_map_new(CC_TYPE_D_RECT); } static void @@ -496,27 +776,16 @@ g_list_foreach(self->children, G_FUNC(ci_remove_swapped), self); // self->children is NULL now + g_object_unref (P(self)->view_data); + P(self)->view_data = NULL; g_object_unref(self->bounds); - g_object_unref(self->all_bounds); - g_object_unref(self->children_bounds); G_OBJECT_CLASS(cc_item_parent_class)->dispose(object); } static void ci_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec) { - CcItem* self = CC_ITEM(object); - switch(prop_id) { - case PROP_ALL_BOUNDS: - g_value_set_boxed(value, self->all_bounds); - break; - case PROP_BOUNDS: - g_value_set_boxed(value, self->bounds); - break; - case PROP_CHILDREN_BOUNDS: - g_value_set_boxed(value, self->children_bounds); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -524,70 +793,89 @@ } static gdouble -ci_distance(CcItem* self, gdouble x, gdouble y, CcItem** found) { +item_distance(CcItem * self, + CcView const* view, + gdouble x, + gdouble y, + CcItem **found) +{ gdouble distance = G_MAXDOUBLE; GList * child; CcItem * child_found = NULL; + g_return_val_if_fail(CC_IS_ITEM(self), distance); g_return_val_if_fail(found && !CC_IS_ITEM(*found), distance); - for(child = g_list_last(self->children); child ; child = child->prev) { - child_found = NULL; - gdouble new_dist = cc_item_distance(CC_ITEM(child->data), x, y, &child_found); - //distance = MIN(distance, new_dist); - - if (distance > new_dist){ - distance = new_dist; - if (child_found) - *found = child_found; - else - *found = CC_ITEM(child->data); - } + cdebug("distance()", "start on %p", self); + + for(child = g_list_last(self->children); child ; child = child->prev, child_found = NULL) { + gdouble new_dist = cc_item_distance(CC_ITEM(child->data), view, x, y, &child_found); + + if(distance > new_dist) { + distance = new_dist; + if (child_found) { + *found = child_found; + } + } } + cdebug("distance()", "end: distance to %s (%p) is %f", + *found ? G_OBJECT_TYPE_NAME(*found) : "NULL", + *found, distance); return distance; } static gboolean -ci_event(CcItem* self, CcView* view, GdkEvent* ev) { +item_event(CcItem * self, + CcView * view, + GdkEvent* event) +{ gboolean retval = FALSE; g_return_val_if_fail(CC_IS_ITEM(self), FALSE); g_return_val_if_fail(CC_IS_VIEW(view), FALSE); - switch(ev->type) { + CDEBUG(GEnumClass* clss = g_type_class_ref(GDK_TYPE_EVENT_TYPE); + cdebug("event()", "%s (%p) received an event of type \"%s\": %p", + G_OBJECT_TYPE_NAME(self), self, + g_enum_get_value(clss, event->type)->value_name, + event); + g_type_class_unref(clss); + ); + + switch(event->type) { case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: case GDK_3BUTTON_PRESS: - g_signal_emit(self, cc_item_signals[BUTTON_PRESS_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[BUTTON_PRESS_EVENT], 0, view, event, &retval); break; case GDK_BUTTON_RELEASE: - g_signal_emit(self, cc_item_signals[BUTTON_RELEASE_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[BUTTON_RELEASE_EVENT], 0, view, event, &retval); break; case GDK_MOTION_NOTIFY: - g_signal_emit(self, cc_item_signals[MOTION_NOTIFY_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[MOTION_NOTIFY_EVENT], 0, view, event, &retval); break; case GDK_ENTER_NOTIFY: - g_signal_emit(self, cc_item_signals[ENTER_NOTIFY_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[ENTER_NOTIFY_EVENT], 0, view, event, &retval); break; case GDK_LEAVE_NOTIFY: - g_signal_emit(self, cc_item_signals[LEAVE_NOTIFY_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[LEAVE_NOTIFY_EVENT], 0, view, event, &retval); break; case GDK_KEY_PRESS: - g_signal_emit(self, cc_item_signals[KEY_PRESS_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[KEY_PRESS_EVENT], 0, view, event, &retval); break; case GDK_KEY_RELEASE: - g_signal_emit(self, cc_item_signals[KEY_RELEASE_EVENT], 0, view, ev, &retval); + g_signal_emit(self, cc_item_signals[KEY_RELEASE_EVENT], 0, view, event, &retval); break; case GDK_FOCUS_CHANGE: - if(!ev->focus_change.in) { - g_signal_emit(self, cc_item_signals[FOCUS_LEAVE], 0, view, ev, &retval); + if(!event->focus_change.in) { + g_signal_emit(self, cc_item_signals[FOCUS_LEAVE], 0, view, event, &retval); } break; default: { GEnumClass* klass = g_type_class_ref(GDK_TYPE_EVENT_TYPE); - GEnumValue* value = g_enum_get_value(klass, ev->type); + GEnumValue* value = g_enum_get_value(klass, event->type); g_type_class_unref(klass); g_message("CcItem::event(): got an unhandled '%s' event", value->value_name); @@ -597,7 +885,7 @@ if(!retval && self->parent) { // FIXME: make sure item->parent is displayed in view - g_signal_emit(self->parent, cc_item_signals[EVENT], 0, view, ev, &retval); + g_signal_emit(self->parent, cc_item_signals[EVENT], 0, view, event, &retval); } return retval; @@ -660,22 +948,30 @@ static void ci_merge_child_bounds(CcItem* child, gpointer rect_and_view[2]) { - CcDRect* all_bounds = cc_hash_map_lookup(child->all_bounds, rect_and_view[1]); - if(all_bounds) { + CcDRect * all_bounds = V(child, rect_and_view[1])->all_bounds; + + if (all_bounds) { CcDRect* rect = rect_and_view[0]; cc_d_rect_union(*all_bounds, *rect, rect); } } static void -ci_notify_child_bounds_real(CcItem* self, CcItem* child, CcView* view, CcDRect const* bounds) { +ci_notify_child_bounds_real(CcItem * self, + CcItem * child, + CcView * view, + CcDRect const* bounds) +{ + CcItemViewData* view_data; GList * it = self->children; + view_data = V(self, view); + if(G_UNLIKELY(!bounds && self->bounds)) { bounds = cc_hash_map_lookup(self->bounds, view); } else if(G_UNLIKELY(!bounds)) { for(it = self->children; it; it = it->next) { - bounds = cc_hash_map_lookup(CC_ITEM(it->data)->all_bounds, view); + bounds = V(it->data, view)->all_bounds; if(bounds) { it = it->next; break; @@ -685,17 +981,17 @@ if(G_LIKELY(bounds)) { CcDRect drect = *bounds; - CcDRect* children_bounds = cc_hash_map_lookup(self->children_bounds, view); gpointer rect_and_view[] = {&drect, view}; g_list_foreach(it, G_FUNC(ci_merge_child_bounds), rect_and_view); - if(!children_bounds || !cc_d_rect_equal(*children_bounds, drect)) { - cc_hash_map_remove(self->children_bounds, view); - cc_hash_map_insert(self->children_bounds, view, cc_d_rect_copy(&drect)); + if(!view_data->children_bounds || !cc_d_rect_equal(*view_data->children_bounds, drect)) { + g_free (view_data->children_bounds); + view_data->children_bounds = cc_d_rect_copy(&drect); ci_update_all_bounds(view, self); } } else { - cc_hash_map_remove(self->children_bounds, view); + g_free (view_data->children_bounds); + view_data->children_bounds = NULL; ci_update_all_bounds(view, self); } } @@ -707,6 +1003,12 @@ static void ci_view_register(CcItem* self, CcView* view) { + gpointer view_data = NULL; + cdebug ("view_register()", "for %s in %s", + G_OBJECT_TYPE_NAME (view), + G_OBJECT_TYPE_NAME (self)); + view_data = g_slice_alloc0 (CC_ITEM_GET_CLASS(self)->view_data_size); + cc_hash_map_insert (P(self)->view_data, view, view_data); g_list_foreach(self->children, G_FUNC(ci_child_emit_view_register), view); } @@ -717,10 +1019,25 @@ static void ci_view_unregister(CcItem* self, CcView* view) { - if(cc_item_get_all_bounds(self, view)) { - cc_item_dirty(self, view, *cc_item_get_all_bounds(self, view)); - } + CcItemViewData* view_data = V(self, view); g_list_foreach(self->children, G_FUNC(ci_child_emit_view_unregister), view); + if(view_data->all_bounds) { + cc_item_dirty(self, view, *view_data->all_bounds); + g_free (view_data->all_bounds); + view_data->all_bounds = NULL; + } + + if (view_data->children_bounds) { + g_free (view_data->children_bounds); + view_data->children_bounds = NULL; + } + + g_slice_free1 (CC_ITEM_GET_CLASS(self)->view_data_size, view_data); + cc_hash_map_remove (P(self)->view_data, view); + cc_hash_map_remove (self->bounds, view); + cdebug ("view_unregister()", "for %s in %s", + G_OBJECT_TYPE_NAME (view), + G_OBJECT_TYPE_NAME (self)); } static void @@ -732,6 +1049,15 @@ go_class->dispose = ci_dispose; go_class->get_property = ci_get_property; + /** + * CcItem::all-bounds-changed + * @self: a #Ccitem + * @view: the #CcView belonging to this event + * @box: a #CcDRect specifying the new bounding box + * + * This signal gets emitted when the total bounding box of an item + * changed. See also . + */ cc_item_signals[ALL_BOUNDS_CHANGED] = g_signal_new("all-bounds-changed", CC_TYPE_ITEM, 0,0, NULL, NULL, @@ -846,6 +1172,17 @@ cc_marshal_BOOLEAN__OBJECT_ENUM, G_TYPE_BOOLEAN, 2, CC_TYPE_VIEW, GTK_TYPE_DIRECTION_TYPE); + /** + * CcItem::focus-enter + * @self: a #CcItem + * @view: a #CcView + * @event: a #GdkEventFocus + * + * This signal gets emitted when the focus enters this item. + * + * Returns %TRUE to stop other signal handlers, %FALSE to allow their + * execution. + */ cc_item_signals[FOCUS_ENTER] = g_signal_new("focus-enter", CC_TYPE_ITEM, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(CcItemClass, focus_enter), @@ -853,6 +1190,17 @@ cc_marshal_BOOLEAN__OBJECT_BOXED, G_TYPE_BOOLEAN, 2, CC_TYPE_VIEW, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + /** + * CcItem::focus-leave + * @self: a #CcItem + * @view: a #CcView + * @event: a #GdkEventFocus + * + * This signal gets emitted when the focus leaves this item. + * + * Returns %TRUE to stop other signal handlers, %FALSE to allow their + * execution. + */ cc_item_signals[FOCUS_LEAVE] = g_signal_new("focus-leave", CC_TYPE_ITEM, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(CcItemClass, focus_leave), @@ -860,6 +1208,17 @@ cc_marshal_BOOLEAN__OBJECT_BOXED, G_TYPE_BOOLEAN, 2, CC_TYPE_VIEW, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + /** + * CcItem::key-press-event + * @self: a #CcItem + * @view: a #CcView + * @event: a #GdkEventKey + * + * This signal gets emitted when a key gets pressed. + * + * Returns %TRUE to stop other signal handlers, %FALSE to allow their + * execution. + */ cc_item_signals[KEY_PRESS_EVENT] = g_signal_new("key-press-event", CC_TYPE_ITEM, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(CcItemClass, key_press_event), @@ -867,6 +1226,17 @@ cc_marshal_BOOLEAN__OBJECT_BOXED, G_TYPE_BOOLEAN, 2, CC_TYPE_VIEW, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + /** + * CcItem::key-release-event + * @self: a #CcItem + * @view: a #CcView + * @event: a #GdkEventKey + * + * This signal gets emitted when a key gets released. + * + * Returns %TRUE to stop other signal handlers, %FALSE to allow their + * execution. + */ cc_item_signals[KEY_RELEASE_EVENT] = g_signal_new("key-release-event", CC_TYPE_ITEM, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(CcItemClass, key_release_event), @@ -972,15 +1342,20 @@ G_TYPE_NONE, 1, CC_TYPE_VIEW); - /* CriaItemClass */ - self_class->distance = ci_distance; - self_class->event = ci_event; + /* CcItemClass */ + self_class->distance = item_distance; + self_class->event = item_event; self_class->focus = ci_focus; self_class->render = ci_render; self_class->notify_child_bounds = ci_notify_child_bounds_real; self_class->view_register = ci_view_register; self_class->view_unregister = ci_view_unregister; + + self_class->view_data_size = 0; + cc_item_class_add_view_data (self_class, sizeof (CcItemViewData)); + + g_type_class_add_private (self_class, sizeof (CcItemPrivate)); } /* CcItemViewIface */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item.h 2006-07-14 17:27:36.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item.h 2007-05-05 21:47:37.000000000 +0100 @@ -1,9 +1,9 @@ -/* this file is part of libccc, criawips' cairo-based canvas +/* this file is part of libccc * * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005,2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -73,10 +73,12 @@ CcItem * child); void cc_item_bounds_changed (CcItem * self, CcView const* view); +void cc_item_repaint (CcItem * self); void cc_item_dirty (CcItem * self, CcView const* view, CcDRect dirty_region); gdouble cc_item_distance (CcItem * self, + CcView const* view, gdouble x, gdouble y, CcItem **found); @@ -108,15 +110,31 @@ CcView* view); void cc_item_remove_view (CcItem* self, CcView* view); +void cc_item_set_position (CcItem* child, + CcItem* parent, + gint position); +void cc_item_raise_to_top (CcItem* child, + CcItem* parent); +void cc_item_raise (CcItem* child, + CcItem* parent); +void cc_item_lower (CcItem* child, + CcItem* parent); +void cc_item_lower_to_bottom (CcItem* child, + CcItem* parent); + +#define CC_ITEM_GET_VIEW_DATA(i,v,t,ctype) ((ctype*) cc_item_get_view_data (i, v, t)) +gpointer cc_item_get_view_data (CcItem const* self, + CcView const* view, + GType type); +void cc_item_class_add_view_data (gpointer item_class, + gsize view_data_size); struct _CcItem { GInitiallyUnowned base_instance; CcItem * parent; CcItemFlags flags; - CcHashMap * all_bounds; CcHashMap * bounds; - CcHashMap * children_bounds; GList * children; GList * views; @@ -127,6 +145,7 @@ /* vtable */ gdouble (*distance) (CcItem * self, + CcView const * view, gdouble x, gdouble y, CcItem **found); @@ -187,6 +206,9 @@ CcView * view); void (*view_unregister) (CcItem * self, CcView * view); + + /*< private >*/ + gsize view_data_size; // never EVER read from or write to this field directly }; G_END_DECLS diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item-view.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item-view.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item-view.c 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item-view.c 2007-04-23 23:49:57.000000000 +0100 @@ -29,11 +29,26 @@ G_DEFINE_IFACE(CcItemView, cc_item_view, G_TYPE_INTERFACE); static void -civ_notify_all_bounds(CcItemView* self, CcView* view, CcDRect* rect, CcItem* item) { +civ_notify_all_bounds (CcItemView * self, + CcView * view, + CcDRect const* rect, + CcItem * item) +{ CC_ITEM_VIEW_GET_CLASS(self)->notify_all_bounds(self, item, view, rect); } static void +emit_notify_all_bounds (CcItem* parent, + CcView* view, + CcItem* item) +{ + civ_notify_all_bounds (CC_ITEM_VIEW (parent), + view, + cc_item_get_all_bounds (item, view), + item); +} + +static void civ_item_dirty(CcItemView* self, CcView* view, CcDRect const* dirty, CcItem* item) { CC_ITEM_VIEW_GET_CLASS(self)->item_dirty(self, item, view, dirty); } @@ -74,7 +89,7 @@ if(CC_IS_VIEW(self)) { civ_update_all_bounds(item, CC_VIEW(self)); } else if(CC_IS_ITEM(self)) { - cc_item_update_bounds(item, NULL); + cc_item_foreach_view (CC_ITEM (self), CC_ITEM_FUNC (emit_notify_all_bounds), item); } } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item-view.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item-view.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-item-view.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-item-view.h 2007-04-23 23:49:57.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -33,6 +33,7 @@ #define CC_TYPE_ITEM_VIEW (cc_item_view_get_type()) #define CC_ITEM_VIEW(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_ITEM_VIEW, CcItemView)) +#define CC_ITEM_VIEW_IFACE(c) ((CcItemViewIface*)g_type_interface_peek ((c), CC_TYPE_ITEM_VIEW)) #define CC_IS_ITEM_VIEW(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_ITEM_VIEW)) #define CC_ITEM_VIEW_GET_CLASS(i) (G_TYPE_INSTANCE_GET_INTERFACE((i), CC_TYPE_ITEM_VIEW, CcItemViewIface)) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-linear-gradient.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-linear-gradient.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-linear-gradient.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-linear-gradient.c 2007-04-20 09:44:43.000000000 +0100 @@ -0,0 +1,206 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-linear-gradient.h" + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_LINEAR_GRADIENT, CcDRect)) + +/** + * SECTION:cc-linear-gradient + * + * Linear gradients are a very nice pattern to fill items with. To permit + * gradients to be applied to different items, the API got designed a bit + * tricky (but still easy to understand). + * + * Instead of working with exact coordinates on items, you specify two points + * for the gradient (the start and the end) relative to the item's bounding + * box. + * + * A gradient from (0.0; 0.0) to (1.0; 1.0) applied to a square will result in + * a linear gradient from the north-western corner of the square to the + * south-eastern corner. + * + * A gradient from (0.5; 0.0) to (0.5; 1.0) applied to a square will result in + * a gradient from the top to the bottom. + * + * Of course, you are not limited to the bounding box of your item. A gradient + * like this can also be applied: (-0.25; 0.0) to (0.5; 1.0). + */ + +CcBrush* +cc_linear_gradient_new(gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2) +{ + return g_object_new(CC_TYPE_LINEAR_GRADIENT, + "x1", x1, "y1", y1, + "x2", x2, "y2", y2, + NULL); +} + +/* GType */ +G_DEFINE_TYPE(CcLinearGradient, cc_linear_gradient, CC_TYPE_GRADIENT); + +enum { + PROP_0, + PROP_POS_X1, + PROP_POS_Y1, + PROP_POS_X2, + PROP_POS_Y2 +}; + +static void +cc_linear_gradient_init(CcLinearGradient* self G_GNUC_UNUSED) +{ + P(self)->x1 = 0.5; + P(self)->x2 = 0.5; + P(self)->y1 = 0.0; + P(self)->y2 = 1.0; +} + +static void +linear_gradient_get_property(GObject * object, + guint prop_id, + GValue * value, + GParamSpec* pspec) +{ + switch(prop_id) { + case PROP_POS_X1: + g_value_set_double(value, P(object)->x1); + break; + case PROP_POS_X2: + g_value_set_double(value, P(object)->x2); + break; + case PROP_POS_Y1: + g_value_set_double(value, P(object)->y1); + break; + case PROP_POS_Y2: + g_value_set_double(value, P(object)->y2); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static void +linear_gradient_set_property(GObject * object, + guint prop_id, + GValue const* value, + GParamSpec * pspec) +{ + switch(prop_id) { + case PROP_POS_X1: + P(object)->x1 = g_value_get_double(value); + g_object_notify(object, "x1"); + break; + case PROP_POS_X2: + P(object)->x2 = g_value_get_double(value); + g_object_notify(object, "x2"); + break; + case PROP_POS_Y1: + P(object)->y1 = g_value_get_double(value); + g_object_notify(object, "y1"); + break; + case PROP_POS_Y2: + P(object)->y2 = g_value_get_double(value); + g_object_notify(object, "y2"); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static cairo_pattern_t* +linear_gradient_create_pattern(CcGradient const* self, + CcView const * view, + CcItem const * item) +{ + CcDRect const* bounds = cc_hash_map_lookup(item->bounds, view); + CcDRect nul = {0.0, 0.0, 0.0, 0.0}; + + if(G_LIKELY(bounds)) { + nul = *bounds; + } + + cc_view_world_to_window(view, &nul.x1, &nul.y1); + cc_view_world_to_window(view, &nul.x2, &nul.y2); + + return cairo_pattern_create_linear(nul.x2 - (1.0-P(self)->x1)*(nul.x2 - nul.x1), + nul.y2 - (1.0-P(self)->y1)*(nul.y2 - nul.y1), + nul.x1 + P(self)->x2*(nul.x2 - nul.x1), + nul.y1 + P(self)->y2*(nul.y2 - nul.y1)); +} + +static void +cc_linear_gradient_class_init(CcLinearGradientClass* self_class) +{ + GObjectClass* object_class = G_OBJECT_CLASS(self_class); + CcGradientClass* gradient_class = CC_GRADIENT_CLASS(self_class); + + object_class->get_property = linear_gradient_get_property; + object_class->set_property = linear_gradient_set_property; + + g_object_class_install_property(object_class, + PROP_POS_X1, + g_param_spec_double("x1", + _("X1"), + _("The first horizontal point."), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); + g_object_class_install_property(object_class, + PROP_POS_Y1, + g_param_spec_double("y1", + _("Y1"), + _("The first vertical point."), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); + g_object_class_install_property(object_class, + PROP_POS_X2, + g_param_spec_double("x2", + _("X2"), + _("The second horizontal point."), + -G_MAXDOUBLE, G_MAXDOUBLE, 1.0, + G_PARAM_READWRITE)); + g_object_class_install_property(object_class, + PROP_POS_Y2, + g_param_spec_double("y2", + _("Y2"), + _("The second vertical point."), + -G_MAXDOUBLE, G_MAXDOUBLE, 1.0, + G_PARAM_READWRITE)); + + /* CcGradientClass */ + gradient_class->create_pattern = linear_gradient_create_pattern; + + /* CcLinearGradientClass */ + g_type_class_add_private(self_class, sizeof(CcDRect)); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-linear-gradient.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-linear-gradient.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-linear-gradient.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-linear-gradient.h 2007-04-20 09:39:56.000000000 +0100 @@ -0,0 +1,44 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_LINEAR_GRADIENT_H +#define CC_LINEAR_GRADIENT_H + +#include + +G_BEGIN_DECLS + +typedef CcGradient CcLinearGradient; +typedef CcGradientClass CcLinearGradientClass; + +#define CC_TYPE_LINEAR_GRADIENT (cc_linear_gradient_get_type()) + +GType cc_linear_gradient_get_type(void); +CcBrush* cc_linear_gradient_new(gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); + +G_END_DECLS + +#endif /* !CC_LINEAR_GRADIENT_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-line.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-line.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-line.c 2006-07-02 23:22:03.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-line.c 2007-05-05 16:10:01.000000000 +0100 @@ -27,6 +27,11 @@ #include #include +struct CcLinePrivate { + GArray * segments; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_LINE, struct CcLinePrivate)) + enum CcSegmentType { CC_SEGMENT_STOP = 0, CC_SEGMENT_MOVE, @@ -48,14 +53,14 @@ cc_line_clear(CcLine* self) { g_return_if_fail(CC_IS_LINE(self)); - g_array_set_size(self->segments, 0); + g_array_set_size(P(self)->segments, 0); cc_item_update_bounds(CC_ITEM(self), NULL); } void cc_line_line(CcLine* self, gdouble x, gdouble y) { - struct CcSegment segment = {CC_SEGMENT_LINE, x, y}; - g_array_append_val(self->segments, segment); + struct CcSegment segment = {CC_SEGMENT_LINE, x, y}; + g_array_append_val(P(self)->segments, segment); cc_item_update_bounds(CC_ITEM(self), &segment); } @@ -63,9 +68,9 @@ void cc_line_move(CcLine* self, gdouble x, gdouble y) { struct CcSegment segment = {CC_SEGMENT_MOVE, x, y}; - g_array_append_val(self->segments, segment); + g_array_append_val(P(self)->segments, segment); - cc_item_update_bounds(CC_ITEM(self), NULL); + cc_item_update_bounds(CC_ITEM(self), &segment); } /* GType */ @@ -73,16 +78,16 @@ static void cc_line_init(CcLine* self) { - self->segments = g_array_new(TRUE, TRUE, sizeof(struct CcSegment)); + P(self)->segments = g_array_new(TRUE, TRUE, sizeof(struct CcSegment)); } static void cl_finalize(GObject* object) { CcLine* self = CC_LINE(object); - if(self->segments) { - g_array_free(self->segments, TRUE); - self->segments = NULL; + if(P(self)->segments) { + g_array_free(P(self)->segments, TRUE); + P(self)->segments = NULL; } G_OBJECT_CLASS(cc_line_parent_class)->finalize(object); @@ -94,13 +99,13 @@ CcLine* self = CC_LINE(item); CcDRect* bounds = cc_hash_map_lookup(item->bounds, view); - if(!bounds && !data && !self->segments->len) { + if(!bounds && !data && !P(self)->segments->len) { return; } - gdouble half_width = ceil(/* FIXME: cc_shape_get_width(CC_SHAPE(item), view)*/ CC_SHAPE(item)->width / 2.0); + gdouble half_width = ceil(cc_shape_get_width(CC_SHAPE(item), view) / 2.0); if(G_LIKELY(segment && bounds)) { - struct CcSegment seg = g_array_index(self->segments, struct CcSegment, self->segments->len - 2); // the formerly last one + struct CcSegment seg = g_array_index(P(self)->segments, struct CcSegment, P(self)->segments->len - 2); // the formerly last one CcDRect dirty = { MIN(seg.x, segment->x) - half_width, MIN(seg.y, segment->y) - half_width, MAX(seg.x, segment->x) + half_width, MAX(seg.y, segment->y) + half_width @@ -113,17 +118,21 @@ cc_item_dirty(item, view, dirty); cc_item_bounds_changed(item, view); - } else if(G_UNLIKELY(!bounds && self->segments->len)) { + } + else if(bounds && !P(self)->segments->len) { + cc_hash_map_remove(item->bounds, view); + } + else if(G_UNLIKELY(!bounds && P(self)->segments->len)) { guint i = 0; CcDRect rect; - segment = &g_array_index(self->segments, struct CcSegment, i); + segment = &g_array_index(P(self)->segments, struct CcSegment, i); rect.x1 = segment->x - half_width; rect.y1 = segment->y - half_width; rect.x2 = segment->x + half_width; rect.y2 = segment->y + half_width; - for(i++; i < self->segments->len; i++) { - segment = &g_array_index(self->segments, struct CcSegment, i); + for(i++; i < P(self)->segments->len; i++) { + segment = &g_array_index(P(self)->segments, struct CcSegment, i); rect.x1 = MIN(rect.x1, segment->x - half_width); rect.y1 = MIN(rect.y1, segment->y - half_width); rect.x2 = MAX(rect.x2, segment->x + half_width); @@ -140,20 +149,20 @@ cl_path(CcShape* shape, CcView* view, cairo_t* cr) { CcLine* self = CC_LINE(shape); struct CcSegment* segment, - * last = &g_array_index(self->segments, struct CcSegment, self->segments->len - 1); + * last = &g_array_index(P(self)->segments, struct CcSegment, P(self)->segments->len - 1); gdouble x, y; + gdouble w = cc_shape_get_width(shape, view); cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND); cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); - for(segment = &g_array_index(self->segments, struct CcSegment, 0); segment <= last; segment++) { + for(segment = &g_array_index(P(self)->segments, struct CcSegment, 0); segment <= last; segment++) { x = segment->x; y = segment->y; cc_view_world_to_window(view, &x, &y); if(CC_ITEM_GRID_ALIGNED(shape)) { - gdouble w = shape->width; cc_point_grid_align(&x, &y, &w); } @@ -188,5 +197,8 @@ /* CcShapeClass */ cs_class = CC_SHAPE_CLASS(self_class); cs_class->path = cl_path; + + /* CcLineClass */ + g_type_class_add_private(self_class, sizeof(struct CcLinePrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-line.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-line.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-line.h 2006-07-02 21:14:47.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-line.h 2007-05-05 14:46:36.000000000 +0100 @@ -28,8 +28,8 @@ G_BEGIN_DECLS -typedef struct _CcLine CcLine; -typedef struct _CcLineClass CcLineClass; +typedef CcShape CcLine; +typedef CcShapeClass CcLineClass; #define CC_TYPE_LINE (cc_line_get_type()) #define CC_LINE(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_LINE, CcLine)) @@ -49,15 +49,6 @@ gdouble x, gdouble y); -struct _CcLine { - CcShape base_instance; - GArray * segments; -}; - -struct _CcLineClass { - CcShapeClass base_class; -}; - G_END_DECLS #endif /* !CC_LINE_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-marshallers.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-marshallers.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-marshallers.c 2006-06-13 12:19:03.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-marshallers.c 2007-05-05 16:30:06.000000000 +0100 @@ -241,3 +241,48 @@ data2); } +/* DOUBLE:OBJECT,DOUBLE,DOUBLE,POINTER (marshallers.list:6) */ +void +cc_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_POINTER (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef gdouble (*GMarshalFunc_DOUBLE__OBJECT_DOUBLE_DOUBLE_POINTER) (gpointer data1, + gpointer arg_1, + gdouble arg_2, + gdouble arg_3, + gpointer arg_4, + gpointer data2); + register GMarshalFunc_DOUBLE__OBJECT_DOUBLE_DOUBLE_POINTER callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + gdouble v_return; + + g_return_if_fail (return_value != NULL); + g_return_if_fail (n_param_values == 5); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_DOUBLE__OBJECT_DOUBLE_DOUBLE_POINTER) (marshal_data ? marshal_data : cc->callback); + + v_return = callback (data1, + g_marshal_value_peek_object (param_values + 1), + g_marshal_value_peek_double (param_values + 2), + g_marshal_value_peek_double (param_values + 3), + g_marshal_value_peek_pointer (param_values + 4), + data2); + + g_value_set_double (return_value, v_return); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-marshallers.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-marshallers.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-marshallers.h 2006-06-13 12:19:03.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-marshallers.h 2007-05-05 16:30:06.000000000 +0100 @@ -46,6 +46,14 @@ gpointer invocation_hint, gpointer marshal_data); +/* DOUBLE:OBJECT,DOUBLE,DOUBLE,POINTER (marshallers.list:6) */ +extern void cc_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_POINTER (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + G_END_DECLS #endif /* __cc_marshal_MARSHAL_H__ */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-pixbuf.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-pixbuf.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-pixbuf.c 2006-06-13 12:02:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-pixbuf.c 2007-05-05 16:10:01.000000000 +0100 @@ -26,6 +26,21 @@ #include #include +struct CcPixbufPrivate { + gdouble pos_x; + gdouble pos_y; + + gdouble width; + gdouble height; + + GdkPixbuf* pixbuf; + gdouble rotation; + + gboolean height_set : 1; + gboolean width_set : 1; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_PIXBUF, struct CcPixbufPrivate)) + CcItem* cc_pixbuf_new(void) { return g_object_new(CC_TYPE_PIXBUF, NULL); @@ -36,19 +51,19 @@ g_return_if_fail(CC_IS_PIXBUF(self)); g_return_if_fail(!pixbuf || GDK_IS_PIXBUF(pixbuf)); - if(pixbuf == self->pixbuf) { + if(pixbuf == P(self)->pixbuf) { return; } // FIXME: redraw on pixbuf changes - if(self->pixbuf) { - g_object_unref(self->pixbuf); - self->pixbuf = NULL; + if(P(self)->pixbuf) { + g_object_unref(P(self)->pixbuf); + P(self)->pixbuf = NULL; } if(pixbuf) { - self->pixbuf = g_object_ref(pixbuf); + P(self)->pixbuf = g_object_ref(pixbuf); } cc_item_update_bounds(CC_ITEM(self), NULL); @@ -56,44 +71,113 @@ } void +cc_pixbuf_set_position_x(CcPixbuf* self, + gdouble pos_x) +{ + g_return_if_fail(CC_IS_PIXBUF(self)); + + if(P(self)->pos_x == pos_x) { + return; + } + + P(self)->pos_x = pos_x; + + cc_item_update_bounds(CC_ITEM(self), NULL); + g_object_notify(G_OBJECT(self), "position-x"); +} + +void +cc_pixbuf_set_position_y(CcPixbuf* self, + gdouble pos_y) +{ + g_return_if_fail(CC_IS_PIXBUF(self)); + + if(P(self)->pos_y == pos_y) { + return; + } + + P(self)->pos_y = pos_y; + + cc_item_update_bounds(CC_ITEM(self), NULL); + g_object_notify(G_OBJECT(self), "position-y"); +} + +void cc_pixbuf_set_position(CcPixbuf* self, gdouble x, gdouble y, gdouble w, gdouble h) { g_return_if_fail(CC_IS_PIXBUF(self)); g_object_set(self, - //"position-x", x, - //"position-x", x, + "position-x", x, + "position-y", y, "position-w", w, "position-h", h, NULL); } +gdouble +cc_pixbuf_get_rotation(CcPixbuf const* self) +{ + g_return_val_if_fail(CC_IS_PIXBUF(self), 0.0); + + return P(self)->rotation; +} + +static void +pixbuf_set_dirty(CcItem * item, + CcView * view, + gpointer unused G_GNUC_UNUSED) +{ + CcDRect const* bbox = cc_item_get_all_bounds(item, view); + if(bbox) { + cc_item_dirty(item, view, *bbox); + } +} + +void +cc_pixbuf_set_rotation(CcPixbuf* self, + gdouble rotation) +{ + g_return_if_fail(CC_IS_PIXBUF(self)); + + if(P(self)->rotation == rotation) { + return; + } + + P(self)->rotation = rotation; + + cc_item_foreach_view(CC_ITEM(self), pixbuf_set_dirty, NULL); + cc_item_update_bounds(CC_ITEM(self), NULL); + g_object_notify(G_OBJECT(self), "rotation"); +} + /* GType */ G_DEFINE_TYPE(CcPixbuf, cc_pixbuf, CC_TYPE_ITEM); enum { PROP_0, PROP_PIXBUF, + PROP_POS_X, + PROP_POS_Y, PROP_POS_W, - PROP_POS_H + PROP_POS_W_SET, + PROP_POS_H, + PROP_POS_H_SET, + PROP_ROTATION }; static void cc_pixbuf_init(CcPixbuf* self) { - cc_pixbuf_set_position(self, 0.0, 0.0, 0.0, 0.0); } static void cp_dispose(GObject* object) { - CcPixbuf* self; - if(CC_ITEM_DISPOSED(object)) { return; } - self = CC_PIXBUF(object); - if(self->pixbuf) { - g_object_unref(self->pixbuf); - self->pixbuf = NULL; + if(P(object)->pixbuf) { + g_object_unref(P(object)->pixbuf); + P(object)->pixbuf = NULL; } G_OBJECT_CLASS(cc_pixbuf_parent_class)->dispose(object); @@ -105,13 +189,28 @@ switch(prop_id) { case PROP_PIXBUF: - g_value_set_object(value, self->pixbuf); + g_value_set_object(value, P(self)->pixbuf); + break; + case PROP_POS_X: + g_value_set_double(value, P(self)->pos_x); + break; + case PROP_POS_Y: + g_value_set_double(value, P(self)->pos_y); break; case PROP_POS_W: - g_value_set_double(value, self->position.x2 - self->position.x1); + g_value_set_double(value, P(self)->width); + break; + case PROP_POS_W_SET: + g_value_set_boolean(value, P(self)->width_set); break; case PROP_POS_H: - g_value_set_double(value, self->position.y2 - self->position.y1); + g_value_set_double(value, P(self)->height); + break; + case PROP_POS_H_SET: + g_value_set_boolean(value, P(self)->height_set); + break; + case PROP_ROTATION: + g_value_set_double(value, P(self)->rotation); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -120,24 +219,50 @@ } static void +pixbuf_set_width_set(CcPixbuf* self, gboolean width_set) +{ + if(P(self)->width_set == width_set) { + return; + } + + P(self)->width_set = width_set; + g_object_notify(G_OBJECT(self), "position-w-set"); +} + +static void cp_set_width(CcPixbuf* self, gdouble width) { - if(width == self->position.x2 - self->position.x1) { + pixbuf_set_width_set(self, TRUE); + + if(width == P(self)->width) { return; } - self->position.x2 = self->position.x1 + width; + P(self)->width = width; cc_item_update_bounds(CC_ITEM(self), NULL); g_object_notify(G_OBJECT(self), "position-w"); } static void +pixbuf_set_height_set(CcPixbuf* self, gboolean height_set) +{ + if(P(self)->height_set == height_set) { + return; + } + + P(self)->height_set = height_set; + g_object_notify(G_OBJECT(self), "position-h-set"); +} + +static void cp_set_height(CcPixbuf* self, gdouble height) { - if(height == self->position.y2 - self->position.y1) { + pixbuf_set_height_set(self, TRUE); + + if(height == P(self)->height) { return; } - self->position.y2 = self->position.y1 + height; + P(self)->height = height; cc_item_update_bounds(CC_ITEM(self), NULL); g_object_notify(G_OBJECT(self), "position-h"); @@ -151,12 +276,27 @@ case PROP_PIXBUF: cc_pixbuf_set_pixbuf(self, g_value_get_object(value)); break; + case PROP_POS_X: +#warning "implement" + break; + case PROP_POS_Y: +#warning "implement" + break; case PROP_POS_W: cp_set_width(self, g_value_get_double(value)); break; + case PROP_POS_W_SET: +#warning "implement" + break; case PROP_POS_H: cp_set_height(self, g_value_get_double(value)); break; + case PROP_POS_H_SET: +#warning "implement" + break; + case PROP_ROTATION: +#warning "implement" + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -167,36 +307,82 @@ cp_render(CcItem* item, CcView* view, cairo_t* cr) { CcPixbuf* self = CC_PIXBUF(item); - if(self->pixbuf) { - CcDRect coordinates = self->position; - cc_view_world_to_window(view, &coordinates.x1, &coordinates.y1); - cc_view_world_to_window(view, &coordinates.x2, &coordinates.y2); - if(CC_ITEM_GRID_ALIGNED(item)) { - gdouble w1 = 1.0, - w2 = w1; - cc_point_grid_align(&coordinates.x1, &coordinates.y1, &w1); - cc_point_grid_align(&coordinates.x2, &coordinates.y2, &w2); + if(P(self)->pixbuf) { + gdouble width = P(self)->width, + height = P(self)->height; + gdouble scale_x = 1.0, + scale_y = 1.0; + gdouble x = P(self)->pos_x, + y = P(self)->pos_y; + CcDRect* bounds; + if(!P(item)->width_set) { + width = gdk_pixbuf_get_width(P(self)->pixbuf); + } + if(!P(item)->height_set) { + height = gdk_pixbuf_get_height(P(self)->pixbuf); } + cc_view_world_to_window(view, &x, &y); + bounds = cc_d_rect_copy(cc_item_get_all_bounds(item, view)); + cc_view_world_to_window(view, &bounds->x1, &bounds->y1); + cc_view_world_to_window(view, &bounds->x2, &bounds->y2); + cc_view_world_to_window_distance(view, &width, &height); cairo_save(cr); - cairo_rectangle(cr, coordinates.x1, coordinates.y1, coordinates.x2 - coordinates.x1, coordinates.y2 - coordinates.y1); - cairo_translate(cr, coordinates.x1, coordinates.y1); - gdouble scale_x = (coordinates.x2 - coordinates.x1) / gdk_pixbuf_get_width(self->pixbuf); - gdouble scale_y = (coordinates.y2 - coordinates.y1) / gdk_pixbuf_get_height(self->pixbuf); + cairo_rectangle(cr, bounds->x1, bounds->y1, bounds->x2 - bounds->x1, bounds->y2 - bounds->y1); + cairo_translate(cr, x, y); + cairo_translate(cr, width / 2, height / 2); + cairo_rotate(cr, P(self)->rotation); + scale_x = (width) / gdk_pixbuf_get_width(P(self)->pixbuf); + scale_y = (height) / gdk_pixbuf_get_height(P(self)->pixbuf); cairo_scale(cr, scale_x, scale_y); - gdk_cairo_set_source_pixbuf(cr, self->pixbuf, 0.0, 0.0); + gdk_cairo_set_source_pixbuf(cr, P(self)->pixbuf, -width/2/scale_x, -height/2/scale_y); cairo_fill(cr); + g_free(bounds); cairo_restore(cr); } } static void cp_update_bounds(CcItem* item, CcView const* view, gpointer user_data) { + CcDRect new_bounds_; CcPixbuf* self = CC_PIXBUF(item); CcDRect* new_bounds = NULL; CcDRect* bounds = cc_hash_map_lookup(item->bounds, view); - if(self->pixbuf) { - new_bounds = &self->position; + if(P(self)->pixbuf) { + new_bounds_.x1 = P(self)->pos_x; + if(!P(self)->width_set) { + new_bounds_.x2 = new_bounds_.x1 + gdk_pixbuf_get_width(P(self)->pixbuf); + } + else { + new_bounds_.x2 = new_bounds_.x1 + P(item)->width; + } + new_bounds_.y1 = P(self)->pos_y; + if(!P(self)->height_set) { + new_bounds_.y2 = P(self)->pos_y + gdk_pixbuf_get_height(P(self)->pixbuf); + } + else { + new_bounds_.y2 = P(self)->pos_y + P(item)->height; + } + new_bounds = &new_bounds_; + + if(P(self)->rotation != 0.0) { + CcDRect temp; + CcDRect temp2; + cairo_matrix_t matrix; + cairo_matrix_init_translate(&matrix, new_bounds_.x2 / 2, new_bounds_.y2 / 2); + cairo_matrix_rotate(&matrix, P(self)->rotation); + cairo_matrix_translate(&matrix, new_bounds_.x2 / -2, new_bounds_.y2 / -2); + temp = new_bounds_; + cairo_matrix_transform_point(&matrix, &temp.x1, &temp.y1); + cairo_matrix_transform_point(&matrix, &temp.x2, &temp.y2); + temp2 = new_bounds_; + cairo_matrix_transform_point(&matrix, &temp2.x1, &temp2.y2); + cairo_matrix_transform_point(&matrix, &temp2.x2, &temp2.y1); + new_bounds_.x1 = MIN(MIN(temp.x1, temp.x2), MIN(temp2.x1, temp2.x2)); + new_bounds_.x2 = MAX(MAX(temp.x1, temp.x2), MAX(temp2.x1, temp2.x2)); + new_bounds_.y1 = MIN(MIN(temp.y1, temp.y2), MIN(temp2.y1, temp2.y2)); + new_bounds_.y2 = MAX(MAX(temp.y1, temp.y2), MAX(temp2.y1, temp2.y2)); + } } if(new_bounds != bounds && (!new_bounds || !bounds || !cc_d_rect_equal(*new_bounds, *bounds))) { @@ -232,6 +418,20 @@ GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); g_object_class_install_property(go_class, + PROP_POS_X, + g_param_spec_double("position-x", + "X Position", + "The horizontal position of the pixbuf", + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); + g_object_class_install_property(go_class, + PROP_POS_Y, + g_param_spec_double("position-y", + "Y Position", + "The vertical position of the pixbuf", + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); + g_object_class_install_property(go_class, PROP_POS_W, g_param_spec_double("position-w", "position-w", @@ -240,6 +440,13 @@ 0.0, G_PARAM_READWRITE)); g_object_class_install_property(go_class, + PROP_POS_W_SET, + g_param_spec_boolean("position-w-set", + "position-w-set", + "Use the specified width instead of the image width", + FALSE, + G_PARAM_READWRITE)); + g_object_class_install_property(go_class, PROP_POS_H, g_param_spec_double("position-h", "position-h", @@ -247,11 +454,27 @@ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); + g_object_class_install_property(go_class, + PROP_POS_H_SET, + g_param_spec_boolean("position-h-set", + "position-h-set", + "Use the specified height instead of the image height", + FALSE, + G_PARAM_READWRITE)); + g_object_class_install_property(go_class, + PROP_ROTATION, + g_param_spec_double("rotation", + "Rotation", + "The rotation of this image", + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, + G_PARAM_READWRITE)); /* CcItemClass */ ci_class = CC_ITEM_CLASS(self_class); // FIXME: implement distance ci_class->render = cp_render; ci_class->update_bounds = cp_update_bounds; + + g_type_class_add_private(self_class, sizeof(struct CcPixbufPrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-pixbuf.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-pixbuf.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-pixbuf.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-pixbuf.h 2006-11-19 00:14:19.000000000 +0000 @@ -29,8 +29,8 @@ G_BEGIN_DECLS -typedef struct _CcPixbuf CcPixbuf; -typedef struct _CcPixbufClass CcPixbufClass; +typedef CcItem CcPixbuf; +typedef CcItemClass CcPixbufClass; #define CC_TYPE_PIXBUF (cc_pixbuf_get_type()) #define CC_PIXBUF(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_PIXBUF, CcPixbuf)) @@ -46,17 +46,14 @@ gdouble y, gdouble w, gdouble h); - -struct _CcPixbuf { - CcItem base_instance; - - CcDRect position; - GdkPixbuf* pixbuf; -}; - -struct _CcPixbufClass { - CcItemClass base_class; -}; +void cc_pixbuf_set_position_x(CcPixbuf* self, + gdouble pos_x); +void cc_pixbuf_set_position_y(CcPixbuf* self, + gdouble pos_y); + +gdouble cc_pixbuf_get_rotation(CcPixbuf const* self); +void cc_pixbuf_set_rotation(CcPixbuf * self, + gdouble rotation); G_END_DECLS diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-radial-gradient.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-radial-gradient.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-radial-gradient.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-radial-gradient.c 2007-04-20 09:42:56.000000000 +0100 @@ -0,0 +1,191 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-radial-gradient.h" + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +struct CcRadialGradientPrivate { + gdouble x; + gdouble y; + gdouble radius; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_RADIAL_GRADIENT, struct CcRadialGradientPrivate)) + +/** + * cc_radial_gradient_new: + * @x: the x position of the gradient's center + * @y: the y position of the gradient's center + * @radius: the radius of the gradient's circle + * + * Create a new radial gradient. + * + * @x, @y and @radius are given in a relation to the item's size and position: + * eg. 0.5 means either "in the middle" (for @x and @y) or "half the size" (for + * @radius). + * + * Returns a new #CcRadialGradient. + */ +CcBrush* +cc_radial_gradient_new(gdouble x, + gdouble y, + gdouble radius) +{ + return g_object_new(CC_TYPE_RADIAL_GRADIENT, + "x", x, + "y", y, + "radius", radius, + NULL); +} + +/* GType */ +G_DEFINE_TYPE(CcRadialGradient, cc_radial_gradient, CC_TYPE_GRADIENT); + +enum { + PROP_0, + PROP_POS_X, + PROP_POS_Y, + PROP_RADIUS +}; + +static void +radial_gradient_get_property(GObject * object, + guint prop_id, + GValue * value, + GParamSpec* pspec) +{ + switch(prop_id) { + case PROP_POS_X: + g_value_set_double(value, P(object)->x); + break; + case PROP_POS_Y: + g_value_set_double(value, P(object)->y); + break; + case PROP_RADIUS: + g_value_set_double(value, P(object)->radius); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void +radial_gradient_set_property(GObject * object, + guint prop_id, + GValue const* value, + GParamSpec * pspec) +{ + switch(prop_id) { + case PROP_POS_X: + P(object)->x = g_value_get_double(value); + g_object_notify(object, "x"); + break; + case PROP_POS_Y: + P(object)->y = g_value_get_double(value); + g_object_notify(object, "y"); + break; + case PROP_RADIUS: + P(object)->radius = g_value_get_double(value); + g_object_notify(object, "radius"); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void +cc_radial_gradient_init(CcRadialGradient* self) +{ + P(self)->x = 0.5; + P(self)->y = 0.5; + P(self)->radius = 0.5; +} + +static cairo_pattern_t* +radial_gradient_create_pattern(CcGradient const* gradient, + CcView const * view, + CcItem const * item) +{ + CcDRect const* bounds = cc_hash_map_lookup(item->bounds, view); + CcDRect nul = {0.0, 0.0, 0.0, 0.0}; + + if(G_LIKELY(bounds)) { + nul = *bounds; + } + + cc_view_world_to_window(view, &nul.x1, &nul.y1); + cc_view_world_to_window(view, &nul.x2, &nul.y2); + + nul.x2 -= nul.x1 + 1.0; + nul.y2 -= nul.y1 + 1.0; + + return cairo_pattern_create_radial(nul.x1 + P(gradient)->x * nul.x2, + nul.y1 + P(gradient)->y * nul.y2, + 0.0, + nul.x1 + P(gradient)->x * nul.x2, + nul.y1 + P(gradient)->y * nul.y2, + P(gradient)->radius * MAX(nul.x2, nul.y2)); +} + +static void +cc_radial_gradient_class_init(CcRadialGradientClass* self_class) +{ + GObjectClass* object_class = G_OBJECT_CLASS(self_class); + CcGradientClass* gradient_class = CC_GRADIENT_CLASS(self_class); + + /* GObjectClass */ + object_class->get_property = radial_gradient_get_property; + object_class->set_property = radial_gradient_set_property; + + g_object_class_install_property(object_class, + PROP_POS_X, + g_param_spec_double("x", + _("X Position"), + _("Horizontal position of the gradient center"), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.5, + G_PARAM_READWRITE)); + g_object_class_install_property(object_class, + PROP_POS_Y, + g_param_spec_double("y", + _("Y Position"), + _("Vertical position of the gradient center"), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.5, + G_PARAM_READWRITE)); + g_object_class_install_property(object_class, + PROP_RADIUS, + g_param_spec_double("radius", + _("Radius"), + _("Gradient Radius"), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.5, + G_PARAM_READWRITE)); + + /* CcGradientClass */ + gradient_class->create_pattern = radial_gradient_create_pattern; + + /* CcRadialGradientClass */ + g_type_class_add_private(self_class, sizeof(struct CcRadialGradientPrivate)); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-radial-gradient.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-radial-gradient.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-radial-gradient.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-radial-gradient.h 2007-04-20 09:42:56.000000000 +0100 @@ -0,0 +1,48 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_RADIAL_GRADIENT_H +#define CC_RADIAL_GRADIENT_H + +#include + +G_BEGIN_DECLS + +typedef CcGradient CcRadialGradient; +typedef CcGradientClass CcRadialGradientClass; + +#define CC_TYPE_RADIAL_GRADIENT (cc_radial_gradient_get_type()) +#define CC_RADIAL_GRADIENT(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_RADIAL_GRADIENT, CcRadialGradient)) +#define CC_RADIAL_GRADIENT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_RADIAL_GRADIENT, CcRadialGradientClass)) +#define CC_IS_RADIAL_GRADIENT(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_RADIAL_GRADIENT)) +#define CC_IS_RADIAL_GRADIENT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_RADIAL_GRADIENT)) +#define CC_RADIAL_GRADIENT_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_RADIAL_GRADIENT, CcRadialGradientClass)) + +GType cc_radial_gradient_get_type(void); +CcBrush* cc_radial_gradient_new(gdouble x, + gdouble y, + gdouble radius); + +G_END_DECLS + +#endif /* !CC_RADIAL_GRADIENT_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-rectangle.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-rectangle.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-rectangle.c 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-rectangle.c 2007-05-05 16:10:01.000000000 +0100 @@ -35,6 +35,16 @@ return g_object_new(CC_TYPE_RECTANGLE, NULL); } +/** + * cc_rectangle_set_position: + * @self: a #CcRectangle + * @x: the horizontal position + * @y: the vertical position + * @w: the width of the rectangle + * @h: the eight of the rectangle + * + * Specify the position of a rectangle. + */ void cc_rectangle_set_position(CcRectangle* self, gdouble x, gdouble y, gdouble w, gdouble h) { g_object_set(self, @@ -164,7 +174,12 @@ } static gdouble -cr_distance(CcItem* item, gdouble x, gdouble y, CcItem** found) { +cr_distance(CcItem * item, + CcView const* view, + gdouble x, + gdouble y, + CcItem **found) +{ CcRectangle* self = CC_RECTANGLE(item); gdouble distance = G_MAXDOUBLE; @@ -172,7 +187,7 @@ g_return_val_if_fail(!CC_IS_ITEM(*found), distance); // search the children first - distance = CC_ITEM_CLASS(cc_rectangle_parent_class)->distance(item, x, y, found); + distance = CC_ITEM_CLASS(cc_rectangle_parent_class)->distance(item, view, x, y, found); if(CC_IS_ITEM(*found)) { return distance; @@ -215,9 +230,10 @@ cr_update_bounds(CcItem* item, CcView const* view, gpointer data) { // check whether the bounds have changed, if so, emit a signal CcRectangle* self = CC_RECTANGLE(item); + gdouble half_width = cc_shape_get_width(CC_SHAPE(item), view) / 2.0; CcDRect drect = { - self->x, self->y, - self->x + self->w, self->y + self->h + self->x - half_width, self->y - half_width, + self->x + self->w - 1.0 + half_width, self->y + self->h - 1.0 + half_width }; CcDRect* bounds = cc_hash_map_lookup(item->bounds, view); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-rounded-rectangle.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-rounded-rectangle.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-rounded-rectangle.c 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-rounded-rectangle.c 2007-05-05 16:10:01.000000000 +0100 @@ -26,6 +26,17 @@ #include #include +struct CcRoundedRectanglePrivate { + gdouble radius; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_ROUNDED_RECTANGLE, struct CcRoundedRectanglePrivate)) + +CcItem* +cc_rounded_rectangle_new(void) +{ + return g_object_new(CC_TYPE_ROUNDED_RECTANGLE, NULL); +} + /* GType stuff */ G_DEFINE_TYPE(CcRoundedRectangle, cc_rounded_rectangle, CC_TYPE_RECTANGLE); @@ -36,7 +47,7 @@ static void cc_rounded_rectangle_init(CcRoundedRectangle* self) { - self->corner_radius = 5.0; + P(self)->radius = 5.0; } static void @@ -45,7 +56,7 @@ switch(prop_id) { case PROP_RADIUS: - g_value_set_double(value, self->corner_radius); + g_value_set_double(value, P(self)->radius); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -59,16 +70,17 @@ cc_item_dirty(CC_ITEM(self), view, dirty); } -static void -crr_set_radius(CcRoundedRectangle* self, gdouble radius) { +void +cc_rounded_rectangle_set_radius(CcRoundedRectangle* self, + gdouble radius) { CcItem * item; gdouble old_radius; - if(self->corner_radius == radius) { + if(P(self)->radius == radius) { return; } - old_radius = self->corner_radius; - self->corner_radius = radius; + old_radius = P(self)->radius; + P(self)->radius = radius; item = CC_ITEM(self); cc_item_foreach_view(item, CC_ITEM_FUNC(crr_dirty_corners), &old_radius); @@ -82,7 +94,7 @@ switch(prop_id) { case PROP_RADIUS: - crr_set_radius(self, g_value_get_double(value)); + cc_rounded_rectangle_set_radius(self, g_value_get_double(value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -95,21 +107,19 @@ CcRectangle* rect = CC_RECTANGLE(shape); CcRoundedRectangle* self = CC_ROUNDED_RECTANGLE(shape); gdouble width = cc_shape_get_width(shape, view); - gdouble radius = self->corner_radius; - gdouble null = 0.0; + gdouble radius = P(self)->radius; gdouble points[][2] = { - {rect->x + radius, rect->y}, - {rect->x + rect->w - radius, rect->y + radius}, - {rect->x + rect->w, rect->y + rect->h - radius} + {rect->x + radius, rect->y + rect->h - radius}, + {rect->x + rect->w - radius, rect->y + radius} }; guint i; cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND); - cc_view_world_to_window(view, &radius, NULL); - cc_view_world_to_window(view, &null, NULL); - radius -= null; - cc_point_grid_align(NULL, NULL, &radius); + cc_view_world_to_window_distance(view, &radius, NULL); + if(CC_ITEM_GRID_ALIGNED(shape)) { + cc_point_grid_align(NULL, NULL, &radius); + } for(i = 0; i < G_N_ELEMENTS(points); i++) { cc_view_world_to_window(view, &points[i][0], &points[i][1]); @@ -118,10 +128,10 @@ } } - cairo_arc (cr, points[1][0], points[1][1], radius, G_PI/-2.0, 0.0); - cairo_arc (cr, points[1][0], points[2][1], radius, 0.0, G_PI/2.0); - cairo_arc (cr, points[0][0], points[2][1], radius, G_PI/2.0, G_PI); - cairo_arc (cr, points[0][0], points[1][1], radius, G_PI, G_PI/-2.0); + cairo_arc(cr, points[1][0], points[1][1], radius, G_PI/-2.0, 0.0); + cairo_arc(cr, points[1][0], points[0][1], radius, 0.0, G_PI/2.0); + cairo_arc(cr, points[0][0], points[0][1], radius, G_PI/2.0, G_PI); + cairo_arc(cr, points[0][0], points[1][1], radius, G_PI, G_PI/-2.0); cairo_close_path(cr); } @@ -149,5 +159,8 @@ /* CcShapeClass */ cs_class = CC_SHAPE_CLASS(self_class); cs_class->path = crr_path; + + /* CcRoundedRectangleClass */ + g_type_class_add_private(self_class, sizeof(struct CcRoundedRectanglePrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-rounded-rectangle.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-rounded-rectangle.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-rounded-rectangle.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-rounded-rectangle.h 2007-04-20 09:39:56.000000000 +0100 @@ -28,8 +28,8 @@ G_BEGIN_DECLS -typedef struct _CcRoundedRectangle CcRoundedRectangle; -typedef struct _CcRoundedRectangleClass CcRoundedRectangleClass; +typedef CcRectangle CcRoundedRectangle; +typedef CcRectangleClass CcRoundedRectangleClass; #define CC_TYPE_ROUNDED_RECTANGLE (cc_rounded_rectangle_get_type()) #define CC_ROUNDED_RECTANGLE(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_ROUNDED_RECTANGLE, CcRoundedRectangle)) @@ -38,17 +38,10 @@ #define CC_IS_ROUNDED_RECTANGLE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_ROUNDED_RECTANGLE)) #define CC_ROUNDED_RECTANGLE_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_ROUNDED_RECTANGLE, CcRoundedRectangleClass)) -GType cc_rounded_rectangle_get_type(void); - -struct _CcRoundedRectangle { - CcRectangle base_instance; - - gdouble corner_radius; -}; - -struct _CcRoundedRectangleClass { - CcRectangleClass base_class; -}; +GType cc_rounded_rectangle_get_type (void); +CcItem* cc_rounded_rectangle_new (void); +void cc_rounded_rectangle_set_radius(CcRoundedRectangle* self, + gdouble radius); G_END_DECLS diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-shape.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-shape.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-shape.c 2006-08-09 15:01:37.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-shape.c 2007-05-05 22:01:07.000000000 +0100 @@ -25,6 +25,12 @@ #include +typedef struct { + CcDistance* width; +} CcShapePrivate; + +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE ((i), CC_TYPE_SHAPE, CcShapePrivate)) + CcBrush* cc_shape_get_brush_border(CcShape* self) { g_return_val_if_fail(CC_IS_SHAPE(self), NULL); @@ -105,15 +111,16 @@ } gdouble -cc_shape_get_width(CcShape* self, CcView* view) { +cc_shape_get_width(CcShape* self, CcView const* view) { gdouble retval; g_return_val_if_fail(CC_IS_SHAPE(self), 0.0); g_return_val_if_fail(CC_IS_VIEW(view), 0.0); - retval = self->width; + retval = P(self)->width->value; - if(self->width_units) { +#warning "FIXME: convert with cc_distance_...() function" + if(P(self)->width->unit != CC_UNIT_DISPLAY_PIXEL) { gdouble tmp = 0.0; cc_view_world_to_window_distance(view, &retval, &tmp); } @@ -121,28 +128,55 @@ return retval; } +/** + * cc_shape_set_line_width: + * @self: a #CcShape + * @width: a #CcDistance + * + * Specify the line width of a canvas item. @self will take the ownership of + * @width. + */ void -cc_shape_set_width_pixels(CcShape* self, gdouble width) { - if(!self->width_units && width == self->width) { +cc_shape_set_line_width (CcShape * self, + CcDistance* width) +{ + CcShapePrivate* private; + + g_return_if_fail (CC_IS_SHAPE (self)); + g_return_if_fail (width); + + private = P(self); + + if (width == private->width) { return; } - self->width_units = FALSE; - self->width = width; + cc_distance_free (private->width); + private->width = width; - g_object_notify(G_OBJECT(self), "width-pixels"); + // FIXME: don't forget the dirty stuff + + g_object_notify (G_OBJECT (self), "width"); } +// FIXME: deprecated void -cc_shape_set_width_units(CcShape* self, gdouble width) { - if(self->width_units && width == self->width) { - return; - } +cc_shape_set_width_pixels (CcShape* self, + gdouble width) +{ + CcDistance* real_width = cc_distance_new (width, CC_UNIT_DISPLAY_PIXEL); + + cc_shape_set_line_width (self, real_width); +} - self->width_units = TRUE; - self->width = width; +// FIXME: deprecated +void +cc_shape_set_width_units (CcShape* self, + gdouble width) +{ + CcDistance* real_width = cc_distance_new (width, CC_UNIT_POINT); - g_object_notify(G_OBJECT(self), "width-units"); + cc_shape_set_line_width (self, real_width); } /* GType stuff */ @@ -152,13 +186,12 @@ PROP_0, PROP_BRUSH_BORDER, PROP_BRUSH_CONTENT, - PROP_WIDTH_PIXELS, - PROP_WIDTH_UNITS + PROP_WIDTH }; static void cc_shape_init(CcShape* self) { - self->width = 1.0; + P(self)->width = cc_distance_new (1.0, CC_UNIT_POINT); } static void @@ -183,6 +216,17 @@ } static void +shape_finalize (GObject* object) +{ + CcShapePrivate* private = P(object); + + cc_distance_free (private->width); + private->width = NULL; + + G_OBJECT_CLASS(cc_shape_parent_class)->finalize (object); +} + +static void cs_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec) { CcShape* self = CC_SHAPE(object); @@ -193,8 +237,10 @@ case PROP_BRUSH_CONTENT: g_value_set_object(value, cc_shape_get_brush_content(self)); break; - case PROP_WIDTH_PIXELS: - case PROP_WIDTH_UNITS: + case PROP_WIDTH: + g_value_set_boxed (value, + P(object)->width); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -212,11 +258,8 @@ case PROP_BRUSH_CONTENT: cc_shape_set_brush_content(self, g_value_get_object(value)); break; - case PROP_WIDTH_PIXELS: - cc_shape_set_width_pixels(self, g_value_get_double(value)); - break; - case PROP_WIDTH_UNITS: - cc_shape_set_width_units(self, g_value_get_double(value)); + case PROP_WIDTH: + cc_shape_set_line_width (self, g_value_get_boxed (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -250,7 +293,7 @@ cairo_new_path(cr); CC_SHAPE_GET_CLASS(self)->path(self, view, cr); cairo_set_line_width(cr, width); - cc_brush_apply(self->brush_border, cr); + cc_brush_apply(self->brush_border, view, CC_ITEM(self), cr); cairo_stroke(cr); cairo_restore(cr); } @@ -262,7 +305,7 @@ cairo_save(cr); cairo_new_path(cr); CC_SHAPE_GET_CLASS(self)->path(self, view, cr); - cc_brush_apply(self->brush_content, cr); + cc_brush_apply(self->brush_content, view, CC_ITEM(self), cr); cairo_fill(cr); cairo_restore(cr); } @@ -276,6 +319,7 @@ /* GObjectClass */ go_class = G_OBJECT_CLASS(self_class); go_class->dispose = cs_dispose; + go_class->finalize = shape_finalize; go_class->get_property = cs_get_property; go_class->set_property = cs_set_property; @@ -294,21 +338,12 @@ CC_TYPE_BRUSH, G_PARAM_READWRITE)); g_object_class_install_property(go_class, - PROP_WIDTH_PIXELS, - g_param_spec_double("width-pixels", - "line width in pixels", - "The width of the outline in pixels", - 0.0, G_MAXDOUBLE, - 1.0, - G_PARAM_WRITABLE)); - g_object_class_install_property(go_class, - PROP_WIDTH_UNITS, - g_param_spec_double("width-units", - "line width in canvas units", - "The width of the outline in canvas units", - 0.0, G_MAXDOUBLE, - 1.0, - G_PARAM_WRITABLE)); + PROP_WIDTH, + g_param_spec_boxed("width", + "line width", + "The width of the outline", + CC_TYPE_DISTANCE, + G_PARAM_READWRITE)); /* CcItemClass */ ci_class = CC_ITEM_CLASS(self_class); @@ -317,5 +352,7 @@ /* CcShapeClass */ self_class->render_content = cs_render_content; self_class->render_border = cs_render_border; + + g_type_class_add_private (self_class, sizeof (CcShapePrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-shape.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-shape.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-shape.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-shape.h 2007-05-05 22:01:07.000000000 +0100 @@ -26,6 +26,7 @@ #include #include +#include G_BEGIN_DECLS @@ -48,7 +49,9 @@ void cc_shape_set_brush_content(CcShape* self, CcBrush* brush); gdouble cc_shape_get_width (CcShape* shape, - CcView * view); + CcView const* view); +void cc_shape_set_line_width (CcShape * shape, + CcDistance * width); void cc_shape_set_width_pixels (CcShape* self, gdouble width); void cc_shape_set_width_units (CcShape* self, @@ -59,9 +62,6 @@ CcBrush * brush_border; CcBrush * brush_content; - - gdouble width; - gboolean width_units; }; struct _CcShapeClass { diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-simple-item.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-simple-item.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-simple-item.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-simple-item.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,165 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-simple-item.h" + +#include +#include + +enum { + SIGNAL_DISTANCE, + SIGNAL_RENDER, + SIGNAL_UPDATE_BOUNDS, + N_SIGNALS +}; + +static gint simple_item_signals[N_SIGNALS] = {0}; + +G_DEFINE_TYPE (CcSimpleItem, cc_simple_item, CC_TYPE_ITEM); + +static void +cc_simple_item_init (CcSimpleItem* self) +{} + +static gdouble +simple_item_distance (CcItem * item, + CcView const* view, + gdouble x, + gdouble y, + CcItem **found) +{ + gdouble retval = G_MAXDOUBLE; + g_signal_emit (item, simple_item_signals[SIGNAL_DISTANCE], 0, view, x, y, found, &retval); + // FIXME: check children + +#ifndef G_DISABLE_CHECKS + if (retval <= 0.0 && !*found) { + g_message ("Please set the return value in your dirty signal on %s (%p)", + G_OBJECT_TYPE_NAME (item), item); + *found = item; + } +#endif + return retval; +} + +static void +simple_item_render (CcItem * item, + CcView * view, + cairo_t* cr) +{ + g_signal_emit (item, simple_item_signals[SIGNAL_RENDER], 0, view, cr); + + if (CC_ITEM_CLASS (cc_simple_item_parent_class)->render) { + CC_ITEM_CLASS (cc_simple_item_parent_class)->render (item, view, cr); + } +} + +static void +simple_item_update_bounds (CcItem * item, + CcView const* view, + gpointer user_data) +{ + g_signal_emit (item, simple_item_signals[SIGNAL_UPDATE_BOUNDS], 0, view, user_data); +} + +static void +cc_simple_item_class_init (CcSimpleItemClass* self_class) +{ + CcItemClass* item_class = CC_ITEM_CLASS (self_class); + + /** + * CcSimpleItem::distance: + * @self: the #CcSimpleItem which received the signal + * @view: the #CcView where the signal was received + * @x: the horizontal coordinate of the tested point + * @y: the vertical coordinate of the tested point + * @retval: a return location for a hit item + * + * Hit-Test an item. This signal gets emitted when the view is trying + * to locate an item at a specific position. See also . + * + * Returns the distance of (@x, @y) to @self. + */ + simple_item_signals[SIGNAL_DISTANCE] = + g_signal_new ("distance", CC_TYPE_SIMPLE_ITEM, + 0, 0, + NULL, NULL, + cc_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_POINTER, + G_TYPE_DOUBLE, + 4, + CC_TYPE_VIEW, + G_TYPE_DOUBLE, + G_TYPE_DOUBLE, + G_TYPE_POINTER); + /** + * CcSimpleItem::render: + * @self: a #CcSimpleItem + * @view: a #CcView + * @cairo: a #cairo_t for rendering + * + * Render the simple item to a view. See also . + */ + simple_item_signals[SIGNAL_RENDER] = + g_signal_new ("render", CC_TYPE_SIMPLE_ITEM, + 0, 0, + NULL, NULL, + cc_marshal_VOID__OBJECT_BOXED, + G_TYPE_NONE, 2, + CC_TYPE_VIEW, + CC_TYPE_CAIRO); + /** + * CcSimpleItem::update-bounds: + * @self: a #CcSimpleItem + * @view: a #CcView + * + * Update the bounding box for a view. See also . + */ + simple_item_signals[SIGNAL_UPDATE_BOUNDS] = + g_signal_new ("update-bounds", CC_TYPE_SIMPLE_ITEM, + 0, 0, + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + CC_TYPE_VIEW); + + item_class->distance = simple_item_distance; + item_class->render = simple_item_render; + item_class->update_bounds = simple_item_update_bounds; +} + +/** + * cc_simple_item_new: + * + * Creates a new item for rapid prototyping. + * + * Returns a new #CcItem. + */ +CcItem* +cc_simple_item_new (void) +{ + return g_object_new (CC_TYPE_SIMPLE_ITEM, NULL); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-simple-item.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-simple-item.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-simple-item.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-simple-item.h 2007-04-28 20:35:43.000000000 +0100 @@ -0,0 +1,46 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_SIMPLE_ITEM_H +#define CC_SIMPLE_ITEM_H + +#include + +G_BEGIN_DECLS + +typedef CcItem CcSimpleItem; +typedef CcItemClass CcSimpleItemClass; + +#define CC_TYPE_SIMPLE_ITEM (cc_simple_item_get_type ()) +#define CC_SIMPLE_ITEM(i) (G_TYPE_CHECK_INSTANCE_CAST ((i), CC_TYPE_SIMPLE_ITEM, CcSimpleItem)) +#define CC_SIMPLE_ITEM_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), CC_TYPE_SIMPLE_ITEM, CcSimpleItemClass)) +#define CC_IS_SIMPLE_ITEM(i) (G_TYPE_CHECK_INSTANCE_TYPE ((i), CC_TYPE_SIMPLE_ITEM)) +#define CC_IS_SIMPLE_ITEM_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), CC_TYPE_SIMPLE_ITEM)) +#define CC_SIMPLE_ITEM_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS ((i), CC_TYPE_SIMPLE_ITEM, CcSimpleItemClass)) + +GType cc_simple_item_get_type (void); +CcItem* cc_simple_item_new (void); + +G_END_DECLS + +#endif /* !CC_SIMPLE_ITEM_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-text.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-text.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-text.c 2006-08-11 14:00:39.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-text.c 2007-05-05 21:52:00.000000000 +0100 @@ -1,9 +1,9 @@ -/* this file is part of libccc, criawips' cairo-based canvas +/* this file is part of libccc * * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -29,12 +29,31 @@ #include #include #include +#include +#include #include + #include "glib-helpers.h" #include "pango-helpers.h" +#define CDEBUG_TYPE cc_text_get_type +#include + +#include +#include + static GQuark ct_quark = 0; +struct CcTextPrivate { + CcItem* caret; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_TEXT, struct CcTextPrivate)) + +typedef struct { + GtkIMContext* im_context; +} CcTextViewData; +#define V(i,v) (CC_ITEM_GET_VIEW_DATA ((i), (v), CC_TYPE_TEXT, CcTextViewData)) + CcItem* cc_text_new(gchar const* text) { return g_object_new(CC_TYPE_TEXT, "text", text, NULL); @@ -92,18 +111,46 @@ } } +/** + * cc_text_set_anchor: + * @self: a #CcText + * @x: the horizontal position of the anchor point + * @y: the vertical position of the anchor point + * + * Specify the location of the anchor point of the text item. + */ void -cc_text_set_anchor(CcText* self, gdouble x, gdouble y) { - CcItem* item = CC_ITEM(self); +cc_text_set_anchor(CcText * self, + gdouble x, + gdouble y) +{ + g_return_if_fail(CC_IS_TEXT(self)); + + // FIXME: add some necessity check self->x = x; self->y = y; - cc_item_update_bounds(item, NULL); + cc_item_update_bounds(CC_ITEM(self), NULL); + // FIXME: add some notification } +/** + * cc_text_set_anchor_type: + * @self: a #CcText + * @anchor: the anchor type to be specified + * + * Set the anchor type of the text item. It specifies the location of the + * anchor point relative to the text (so that north-west would become the + * top-left corner). + */ void -cc_text_set_anchor_type(CcText* self, GtkAnchorType anchor) { +cc_text_set_anchor_type(CcText * self, + GtkAnchorType anchor) +{ + g_return_if_fail(CC_IS_TEXT(self)); + // FIXME: check enum value + if(self->anchor == anchor) { return; } @@ -115,6 +162,21 @@ } void +cc_text_set_attributes(CcText * self, + PangoAttrList* attrs) +{ + g_return_if_fail(CC_IS_TEXT(self)); + + cdebug("set_attributes()", "pango_layout_set_attributes()"); + pango_layout_set_attributes(self->layout, attrs); + cc_item_update_bounds(CC_ITEM(self), NULL); + // FIXME: mark dirty + + g_object_notify(G_OBJECT(self), "attributes"); + +} + +void cc_text_set_editable(CcText* self, gboolean editable) { g_return_if_fail(CC_IS_TEXT(self)); @@ -124,7 +186,7 @@ self->editable = editable; - // FIXME: request a redraw for each view, the cursor has (dis)appeared + cc_item_update_bounds(CC_ITEM(self), NULL); g_object_notify(G_OBJECT(self), "editable"); } @@ -137,6 +199,7 @@ */ void cc_text_set_font_description(CcText* self, PangoFontDescription* desc) { + cdebug("set_font_description()", "pango_layout_set_font_description()"); pango_layout_set_font_description(self->layout, desc); // FIXME: forward the description-changed signal cc_item_update_bounds(CC_ITEM(self), NULL); @@ -150,9 +213,9 @@ * Set the markup displayed by this item. */ void -cc_text_set_markup(CcText* text, gchar const* markup) { - // FIXME: implement markup - cc_text_set_text(text, markup); +cc_text_set_markup(CcText* self, gchar const* markup) { + g_warning("FIXME: implement markup"); + cc_text_set_text(self, markup); } /** @@ -177,35 +240,22 @@ cc_item_update_bounds(CC_ITEM(self), NULL); } -/** - * cc_text_set_text: - * @self: a #CcText - * @text: the text to be set - * - * Set the text to be displayed by a #CcText item. - */ -void -cc_text_set_text(CcText* self, gchar const* text) { - g_return_if_fail(CC_IS_TEXT(self)); - - pango_layout_set_text(self->layout, text, -1); +static void +text_update_caret(CcText* self) +{ + // render cursor + PangoRectangle cursor, cursor2, ink; + CcDRect dr; + pango_layout_get_extents(self->layout, &ink, NULL); + pango_layout_get_cursor_pos(self->layout, self->cursor + self->cursor_trail, &cursor, &cursor2); + dr.x1 = /*x +*/ (ink.x + cursor.x) / PANGO_SCALE; + dr.y1 = /*y +*/ (ink.y + cursor.y) / PANGO_SCALE; + dr.x2 = dr.x1 + cursor.width / PANGO_SCALE; + dr.y2 = dr.y1 + cursor.height / PANGO_SCALE; + cc_caret_set_position(CC_CARET(P(self)->caret), dr.x1, dr.y1, dr.x2, dr.y2); cc_item_update_bounds(CC_ITEM(self), NULL); - - g_object_notify(G_OBJECT(self), "text"); } -/* GType stuff */ -G_DEFINE_TYPE(CcText, cc_text, CC_TYPE_SHAPE); - -enum { - PROP_0, - PROP_ANCHOR, - PROP_CURSOR, - PROP_EDITABLE, - PROP_SIZE_PIXELS, - PROP_TEXT -}; - static void ct_move_cursor(CcText* self, CcView* view, gint direction) { PangoLayout* layout = self->layout; @@ -230,10 +280,48 @@ } g_object_notify(G_OBJECT(self), "cursor"); + text_update_caret(self); cc_item_dirty(CC_ITEM(self), view, *cc_item_get_all_bounds(CC_ITEM(self), view)); } } +/** + * cc_text_set_text: + * @self: a #CcText + * @text: the text to be set + * + * Set the text to be displayed by a #CcText item. + */ +void +cc_text_set_text(CcText* self, gchar const* text) { + g_return_if_fail(CC_IS_TEXT(self)); +#if 0 + while(P(self)->cursor, P(self)->cursor_trail) { + ct_move_cursor(); + } +#endif + cdebug("set_text()", "pango_layout_set_text()"); + pango_layout_set_text (self->layout, text, -1); + cc_item_update_bounds (CC_ITEM(self), NULL); + cc_item_repaint (CC_ITEM (self)); + + g_object_notify(G_OBJECT(self), "text"); +} + +/* GType stuff */ +G_DEFINE_TYPE(CcText, cc_text, CC_TYPE_SHAPE); + +enum { + PROP_0, + PROP_ANCHOR, + PROP_ATTRIBUTES, + PROP_BRUSH_CARET, + PROP_CURSOR, + PROP_EDITABLE, + PROP_SIZE_PIXELS, + PROP_TEXT +}; + static void ct_insert_and_move_cursor(CcText* self, CcView* view, gchar const* text) { gsize i = self->cursor; @@ -254,12 +342,19 @@ } static void -cc_text_init(CcText* self) { +cc_text_init(CcText* self) +{ + CcBrush* brush; + + //cdebug("init()", "pango_layout_new_cairo()"); self->layout = pango_layout_new_cairo(); - self->im_contexts = cc_hash_map_new(GTK_TYPE_IM_CONTEXT); + P(self)->caret = cc_caret_new(); + cc_item_set_grid_aligned(P(self)->caret, TRUE); + brush = cc_brush_color_new(cc_color_new_rgb(0.0, 0.0, 0.0)); + cc_shape_set_brush_border(CC_SHAPE(P(self)->caret), brush); - cc_shape_set_brush_content(CC_SHAPE(self), cc_brush_color_new(cc_color_new_rgb(0.0, 0.0, 0.0))); + cc_shape_set_brush_content(CC_SHAPE(self), brush); } static void @@ -270,14 +365,16 @@ return; } + if(P(self)->caret) { + g_object_unref(P(self)->caret); + P(self)->caret = NULL; + } + if(self->layout) { g_object_unref(self->layout); self->layout = NULL; } - g_object_unref(self->im_contexts); - self->im_contexts = NULL; - G_OBJECT_CLASS(cc_text_parent_class)->dispose(object); } @@ -287,35 +384,19 @@ CC_ITEM_CLASS(cc_text_parent_class)->render(item, view, cr); if(self->editable) { - // render cursor - PangoRectangle cursor, cursor2, ink; - CcDRect dr; - gdouble width = 1.0; - pango_layout_get_extents(self->layout, &ink, NULL); - pango_layout_get_cursor_pos(self->layout, self->cursor + self->cursor_trail, &cursor, &cursor2); - dr.x1 = /*x +*/ (ink.x + cursor.x) / PANGO_SCALE; - dr.y1 = /*y +*/ (ink.y + cursor.y) / PANGO_SCALE; - dr.x2 = dr.x1 + cursor.width / PANGO_SCALE; - dr.y2 = dr.y1 + cursor.height / PANGO_SCALE; - cc_point_grid_align(&dr.x1, &dr.y1, &width); - cc_point_grid_align(&dr.x2, &dr.y2, &width); - cairo_save(cr); - cairo_move_to(cr, dr.x1, dr.y1); - cairo_line_to(cr, dr.x2, dr.y2); - cairo_set_line_width(cr, width); - cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); - cairo_stroke(cr); - cairo_restore(cr); + cc_item_render(P(item)->caret, view, cr); } } static void -ct_path(CcShape* shape, CcView* view, cairo_t* cr) { +ct_path(CcShape* shape, + CcView * view, + cairo_t* cr) +{ CcText * self = CC_TEXT(shape); PangoLayout* layout = self->layout; - CcDRect * bounds = cc_hash_map_lookup(CC_ITEM(shape)->bounds, view); - gdouble x = ct_get_x_offset(self, self->x, bounds->x2 - bounds->x1), - y = ct_get_y_offset(self, self->y, bounds->y2 - bounds->y1); + CcDRect * bounds; + gdouble x, y; PangoFontDescription const* desc_old = pango_layout_get_font_description(layout); PangoFontDescription * backup = pango_font_description_copy(desc_old ? desc_old : pango_context_get_font_description(pango_cairo_font_map_create_context(PANGO_CAIRO_FONT_MAP(pango_cairo_font_map_get_default())))); PangoFontDescription * desc_new = pango_font_description_copy_static(backup); @@ -323,6 +404,12 @@ gdouble old_size = 0.0, new_size = 0.0; + bounds = cc_hash_map_lookup(CC_ITEM(shape)->bounds, view); + g_return_if_fail(bounds); + + x = ct_get_x_offset(self, self->x, bounds->x2 - bounds->x1); + y = ct_get_y_offset(self, self->y, bounds->y2 - bounds->y1); + cc_view_world_to_window(view, &x, &y); if(!self->size_pixels) { @@ -337,6 +424,7 @@ pango_font_description_set_size(desc_new, new_size); } + //cdebug("path()", "pango_layout_set_font_description()"); pango_layout_set_font_description(layout, desc_new); } @@ -346,7 +434,9 @@ } cairo_move_to(cr, x, y); + //cdebug("path()", "pango_cairo_update_layout()"); pango_cairo_update_layout(cr, layout); + //cdebug("path()", "pango_cairo_layout_path()"); pango_cairo_layout_path(cr, layout); if(!self->size_pixels) { @@ -365,6 +455,12 @@ case PROP_ANCHOR: g_value_set_enum(value, self->anchor); break; + case PROP_ATTRIBUTES: + g_value_set_boxed(value, pango_layout_get_attributes(self->layout)); + break; + case PROP_BRUSH_CARET: + g_value_set_object(value, cc_shape_get_brush_border(CC_SHAPE(P(object)->caret))); + break; case PROP_EDITABLE: g_value_set_boolean(value, cc_text_is_editable(self)); break; @@ -388,6 +484,12 @@ case PROP_ANCHOR: cc_text_set_anchor_type(self, g_value_get_enum(value)); break; + case PROP_ATTRIBUTES: + cc_text_set_attributes(self, g_value_get_boxed(value)); + break; + case PROP_BRUSH_CARET: + cc_shape_set_brush_border(CC_SHAPE(P(object)->caret), g_value_get_object(value)); + break; case PROP_EDITABLE: cc_text_set_editable(self, g_value_get_boolean(value)); break; @@ -409,6 +511,7 @@ CcDRect new_bounds; CcText* self = CC_TEXT(item); CcDRect* bounds = cc_hash_map_lookup(item->bounds, view); + CcDRect const* caret = cc_item_get_all_bounds(P(item)->caret, view); pango_layout_get_extents(self->layout, NULL, &rect); @@ -417,6 +520,19 @@ new_bounds.x2 = new_bounds.x1 + (1.0 * rect.width / PANGO_SCALE); new_bounds.y2 = new_bounds.y1 + (1.0 * rect.height / PANGO_SCALE); + if(self->editable && caret) { +#if 0 + g_print("text (%.0fx%.0f)=>(%.0fx%.0f) + caret (%.0fx%.0f)=>(%.0fx%.0f) = ", + new_bounds.x1, new_bounds.y1, new_bounds.x2, new_bounds.y2, + caret->x1, caret->y1, caret->x2, caret->y2); +#endif + cc_d_rect_union(new_bounds, *caret, &new_bounds); +#if 0 + g_print("result (%.0fx%.0f)=>(%.0fx%.0f)\n", + new_bounds.x1, new_bounds.y1, new_bounds.x2, new_bounds.y2); +#endif + } + if(!bounds || !cc_d_rect_equal(new_bounds, *bounds)) { if(bounds) { cc_item_dirty(item, view, *bounds); @@ -472,7 +588,7 @@ gsize cursor = 0; gsize length_of_deleted_char = 0; - g_return_if_fail(CC_TEXT_GET_CLASS(self)->delete); + g_return_if_fail(CC_TEXT_GET_CLASS(self)->remove); text = pango_layout_get_text(self->layout); cursor = self->cursor; @@ -508,7 +624,7 @@ ct_move_cursor(self, view, -offset); } - CC_TEXT_GET_CLASS(self)->delete(self, cursor - offset, length_of_deleted_char); + CC_TEXT_GET_CLASS(self)->remove(self, cursor - offset, length_of_deleted_char); g_object_notify(G_OBJECT(self), "cursor"); cc_item_dirty(CC_ITEM(self), view, *cc_item_get_all_bounds(CC_ITEM(self), view)); } @@ -535,11 +651,15 @@ } static gboolean -ct_key_press_event(CcItem* item, CcView* view, GdkEventKey* ev) { +ct_key_press_event (CcItem * item, + CcView * view, + GdkEventKey* ev) +{ + CcTextViewData* view_data = V(item, view); CcText * self = CC_TEXT(item); gboolean retval = FALSE; - if(gtk_im_context_filter_keypress(cc_hash_map_lookup(self->im_contexts, view), ev)) { + if (gtk_im_context_filter_keypress (view_data->im_context, ev)) { return TRUE; } @@ -611,37 +731,53 @@ static void ct_im_context_commit(CcText* self, gchar const* text, GtkIMContext* context) { CcView* view = g_object_get_qdata(G_OBJECT(context), ct_quark); - ct_insert_and_move_cursor(self,view, text); + ct_insert_and_move_cursor(self, view, text); } static void -ct_view_register(CcItem* item, CcView* view) { - CcText * self = CC_TEXT(item); - GtkIMContext* imc = NULL; +ct_view_register (CcItem* item, + CcView* view) +{ + CcTextViewData* view_data; + CcText * self = CC_TEXT(item); if(CC_ITEM_CLASS(cc_text_parent_class)->view_register) { CC_ITEM_CLASS(cc_text_parent_class)->view_register(item, view); } + view_data = V(item, view); + // set up the data for this view - imc = gtk_im_multicontext_new(); - g_object_set_qdata(G_OBJECT(imc), ct_quark, view); + view_data->im_context = gtk_im_multicontext_new(); + g_object_set_qdata(G_OBJECT(view_data->im_context), ct_quark, view); // FIXME: maybe try to set the GdkWindow of the im_context // FIXME: set the view as a data pointer - g_signal_connect_swapped(imc, "commit", + g_signal_connect_swapped(view_data->im_context, "commit", G_CALLBACK(ct_im_context_commit), self); - cc_hash_map_insert(self->im_contexts, view, imc); + + /* register caret */ + cc_item_add_view(P(item)->caret, view); } static void -ct_view_unregister(CcItem* item, CcView* view) { +ct_view_unregister (CcItem* item, + CcView* view) +{ + CcTextViewData* view_data; CcText * self = CC_TEXT(item); - GtkIMContext* imc = cc_hash_map_lookup(self->im_contexts, view); + + view_data = V(item, view); + + /* caret cleanup */ + cc_item_remove_view(P(item)->caret, view); + // remove the data for this view // FIXME: make sure the signal handler gets disconnected // FIXME: make sure the connected data gets deleted - g_signal_handlers_disconnect_by_func(imc, ct_insert_and_move_cursor, self); - cc_hash_map_remove(self->im_contexts, view); + + g_signal_handlers_disconnect_by_func(view_data->im_context, ct_im_context_commit, self); + g_object_unref (view_data->im_context); + view_data->im_context = NULL; if(CC_ITEM_CLASS(cc_text_parent_class)->view_unregister) { CC_ITEM_CLASS(cc_text_parent_class)->view_unregister(item, view); @@ -683,12 +819,26 @@ g_object_class_install_property(go_class, PROP_ANCHOR, g_param_spec_enum("anchor", - "Anchor", - "The location of the anchor point of the text element", + _("Anchor"), + _("The location of the anchor point of the text element"), GTK_TYPE_ANCHOR_TYPE, GTK_ANCHOR_NW, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property(go_class, + PROP_ATTRIBUTES, + g_param_spec_boxed("attributes", + _("Attributes"), + _("The PangoAttrList that specifies the "), + PANGO_TYPE_ATTR_LIST, + G_PARAM_READWRITE)); + g_object_class_install_property(go_class, + PROP_BRUSH_CARET, + g_param_spec_object("brush-caret", + _("Caret Brush"), + _("The brush used to paint the caret (text cursor)"), + CC_TYPE_BRUSH, + G_PARAM_READWRITE)); + g_object_class_install_property(go_class, PROP_CURSOR, g_param_spec_int("cursor", "cursor", @@ -734,6 +884,9 @@ /* CcTextClass */ self_class->insert = ct_insert; - self_class->delete = ct_delete; + self_class->remove = ct_delete; + + cc_item_class_add_view_data (self_class, sizeof (CcTextViewData)); + g_type_class_add_private(self_class, sizeof(struct CcTextPrivate)); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-text.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-text.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-text.h 2006-08-09 15:02:42.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-text.h 2007-05-05 21:52:00.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -51,12 +51,14 @@ gdouble y); void cc_text_set_anchor_type (CcText * self, GtkAnchorType anchor); +void cc_text_set_attributes (CcText * self, + PangoAttrList * attrs); void cc_text_set_editable (CcText * self, gboolean editable); void cc_text_set_font_description(CcText * self, PangoFontDescription* desc); void cc_text_set_markup (CcText * self, - gchar const * text); + gchar const * markup); void cc_text_set_size_pixels (CcText * self, gboolean size_pixels); void cc_text_set_text (CcText * self, @@ -77,14 +79,13 @@ gboolean editable; gint cursor, cursor_trail; - CcHashMap * im_contexts; }; struct _CcTextClass { CcShapeClass base_class; /* vtable */ - void (*delete) (CcText * self, + void (*remove) (CcText * self, guint offset, gsize length); void (*insert) (CcText * self, diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-unit.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-unit.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-unit.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-unit.c 2007-05-05 14:45:44.000000000 +0100 @@ -0,0 +1,95 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-unit.h" + +#include + +/** + * CcUnit: + * @CC_UNIT_PIXEL: The value is given in display pixels. It doesn't depend on + * the resolution or the current zoom level. + * @CC_UNIT_PX: an alias for %CC_UNIT_PIXEL + * @CC_UNIT_POINT: 1/72 of an inch + * @CC_UNIT_PT: an alias for %CC_UNIT_POINT + * + * #CcUnit represents a length unit. It is used to represent sizes that are not + * given in pixels. It's also very useful for resolution-independent rendering + * of sizes and positions. + */ + +G_DEFINE_BOXED_TYPE (CcDistance, cc_distance); + +/** + * CcDistance: + * + * #CcDistance represents a one-dimensional length measured in a certain unit. + * You shouldn't access the attributes directly. + */ + +/** + * cc_distance_new: + * @value: the size + * @unit: the unit belonging to the size + * + * Create a new distance representation. + * + * Returns a newly allocated #CcDistance. + */ +CcDistance* +cc_distance_new (gdouble value, + CcUnit unit) +{ + CcDistance self = {value, unit}; + return cc_distance_copy (&self); +} + +/** + * cc_distance_copy: + * @self: a #CcDistance + * + * Create a new #CcDistance by copying another. + * + * Returns a copy of @self. + */ +CcDistance* +cc_distance_copy (CcDistance const* self) +{ + CcDistance* copy = g_slice_new (CcDistance); + copy->value = self->value; + copy->unit = self->unit; + return copy; +} + +/** + * cc_distance_free: + * @self: a #CcDistance + * + * Free the memory that was occupied by @self. + */ +void +cc_distance_free (CcDistance* self) +{ + g_slice_free (CcDistance, self); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-unit.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-unit.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-unit.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-unit.h 2007-05-05 14:45:44.000000000 +0100 @@ -0,0 +1,73 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_UNIT_H +#define CC_UNIT_H + +#include + +G_BEGIN_DECLS + +/* http://www.w3.org/TR/css3-values/#lengths */ + +typedef enum { + /* relative sizes */ + CC_UNIT_DISPLAY_PIXEL, + /* EM */ + /* EX */ + /* CC_UNIT_PIXEL, */ + /* GD */ + /* REM */ + /* VW */ + /* VH */ + /* VM */ + /* CH */ + /* absolute size */ + /* IN */ + /* CM */ + /* MM */ + CC_UNIT_POINT, + /* PC */ + /* aliases */ + /* CC_UNIT_PX = CC_UNIT_PIXEL, */ + CC_UNIT_PT = CC_UNIT_POINT +} CcUnit; + +#define CC_TYPE_DISTANCE (cc_distance_get_type ()) +typedef struct _CcDistance CcDistance; + +struct _CcDistance { + /*< private >*/ + gdouble value; + CcUnit unit; +}; + +GType cc_distance_get_type (void); +CcDistance* cc_distance_new (gdouble value, + CcUnit unit); +CcDistance* cc_distance_copy (CcDistance const* self); +void cc_distance_free (CcDistance * self); + +G_END_DECLS + +#endif /* !CC_UNIT_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-utils.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-utils.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-utils.h 2006-06-13 12:02:19.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-utils.h 2007-05-05 14:45:44.000000000 +0100 @@ -44,6 +44,16 @@ CC_ZOOM_AUTO } CcZoomMode; +#define cc_return_if_unimplemented_code(klass, member, CODE) G_STMT_START {\ + if(!klass->member) {\ + g_warning("%s doesn't implement %s", g_type_name(G_TYPE_FROM_CLASS(klass)), G_STRINGIFY(member));\ + CODE;\ + return;\ + }\ +} G_STMT_END; + +#define cc_return_if_unimplemented(klass, member) cc_return_if_unimplemented_code(klass, member, {}) + G_END_DECLS #endif /* !CC_UTILS_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view.c 2006-06-13 12:02:19.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view.c 2007-05-05 15:00:43.000000000 +0100 @@ -146,7 +146,9 @@ * scrollbars. */ void -cc_view_set_scrolled_region(CcView* self, CcDRect* scrolled_region) { +cc_view_set_scrolled_region(CcView * self, + CcDRect const* scrolled_region) +{ g_return_if_fail(CC_IS_VIEW(self)); g_object_set(self, "scrolled-region", scrolled_region, NULL); } @@ -173,7 +175,10 @@ * Convert @window_x and @window_y to @world_x and @world_y if given. */ void -cc_view_window_to_world(CcView* self, gdouble* x, gdouble* y) { +cc_view_window_to_world(CcView const* self, + gdouble * x, + gdouble * y) +{ g_return_if_fail(CC_VIEW_GET_CLASS(self)->window_to_world); CC_VIEW_GET_CLASS(self)->window_to_world(self, x, y); @@ -188,8 +193,11 @@ * Convert @x and @y to window coordinates if given. */ void -cc_view_world_to_window(CcView* self, gdouble* x, gdouble* y) { - g_return_if_fail(CC_VIEW_GET_CLASS(self)->world_to_window); +cc_view_world_to_window(CcView const* self, + gdouble * x, + gdouble * y) +{ + cc_return_if_unimplemented(CC_VIEW_GET_CLASS(self), world_to_window); CC_VIEW_GET_CLASS(self)->world_to_window(self, x, y); } @@ -203,7 +211,10 @@ * Convert @x and @y to window coordinates */ void -cc_view_world_to_window_distance(CcView* self, gdouble* x, gdouble* y) { +cc_view_world_to_window_distance(CcView const* self, + gdouble * x, + gdouble * y) +{ g_return_if_fail(CC_VIEW_GET_CLASS(self)->world_to_window_distance); CC_VIEW_GET_CLASS(self)->world_to_window_distance(self, x, y); @@ -237,6 +248,7 @@ "The root element of this canvas", CC_TYPE_ITEM, G_PARAM_READWRITE)); +#warning "FIXME: rename scrolled region" g_object_interface_install_property(iface, g_param_spec_boxed("scrolled-region", "scrolled-region", diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-cell-renderer.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-cell-renderer.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-cell-renderer.c 2006-06-13 12:02:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-cell-renderer.c 2007-05-05 15:00:43.000000000 +0100 @@ -23,17 +23,35 @@ #include +#include #include -G_DEFINE_TYPE_WITH_CODE(CcViewCellRenderer, cc_view_cell_renderer, GTK_TYPE_CELL_RENDERER, - G_IMPLEMENT_INTERFACE(CC_TYPE_VIEW, NULL)); +struct CcViewCellRendererPrivate { + CcItem * root; + cairo_matrix_t matrix; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_VIEW_CELL_RENDERER, struct CcViewCellRendererPrivate)) +/** + * cc_view_cell_renderer_new: + * + * Creates a #GtkCellRenderer that can be used to display a canvas in a + * #GtkCellLayout (like #GtkTreeView or #GtkComboBox). + * + * Returns a new instance of #CcViewCellRenderer. + */ GtkCellRenderer* cc_view_cell_renderer_new(void) { return g_object_new(CC_TYPE_VIEW_CELL_RENDERER, NULL); } /* GType stuff */ +static void cell_render_implement_item_view(CcItemViewIface* iface); +static void cell_renderer_implement_view(CcViewIface* iface); +G_DEFINE_TYPE_WITH_CODE(CcViewCellRenderer, cc_view_cell_renderer, GTK_TYPE_CELL_RENDERER, + G_IMPLEMENT_INTERFACE(CC_TYPE_ITEM_VIEW, cell_render_implement_item_view); + G_IMPLEMENT_INTERFACE(CC_TYPE_VIEW, cell_renderer_implement_view)); + enum { PROP_0, PROP_FOCUS, @@ -55,10 +73,7 @@ } self->disposed = TRUE; - if(self->root) { - g_object_unref(self->root); - self->root = NULL; - } + cc_view_set_root(CC_VIEW(object), NULL); G_OBJECT_CLASS(cc_view_cell_renderer_parent_class)->dispose(object); } @@ -69,7 +84,7 @@ switch(prop_id) { case PROP_ROOT: - g_value_set_object(value, self->root); + g_value_set_object(value, P(self)->root); break; case PROP_ZOOM: g_value_set_double(value, self->zoom); @@ -88,15 +103,18 @@ switch(prop_id) { case PROP_ROOT: - if(self->root == g_value_get_object(value)) { + if(P(self)->root == g_value_get_object(value)) { break; } - if(self->root) { - g_object_unref(self->root); - self->root = NULL; + if(P(self)->root) { + cc_item_view_unregister(CC_ITEM_VIEW(self), P(self)->root); + g_object_unref(P(self)->root); + P(self)->root = NULL; } if(g_value_get_object(value)) { - self->root = g_object_ref(g_value_get_object(value)); + P(self)->root = g_object_ref(g_value_get_object(value)); + cc_item_view_register(CC_ITEM_VIEW(self), P(self)->root); + cc_item_update_bounds_for_view(P(self)->root, CC_VIEW(self)); } g_object_notify(object, "root"); break; @@ -113,19 +131,50 @@ } static void -cvcr_get_size(GtkCellRenderer* renderer, GtkWidget* widget, GdkRectangle* renderer_area, gint* x_offset, gint* y_offset, gint* width, gint* height) { +cvcr_get_size(GtkCellRenderer* renderer, + GtkWidget * widget, + GdkRectangle * renderer_area, + gint * x_offset, + gint * y_offset, + gint * width, + gint * height) +{ + CcDRect const* bounds = cc_item_get_all_bounds(P(renderer)->root, CC_VIEW(renderer)); + + if(!bounds) { + return; + } + if(width) { - *width = 0; + *width = bounds->x2 - bounds->x1; } if(height) { - *height = 0; + *height = bounds->y2 - bounds->y1; } } static void -cvcr_render(GtkCellRenderer* renderer, GdkDrawable* window, GtkWidget* widget, GdkRectangle* background_area, GdkRectangle* cell_area, GdkRectangle* expose_area, GtkCellRendererState flags) { - // FIXME: add implementation +cvcr_render(GtkCellRenderer * renderer, + GdkDrawable * window, + GtkWidget * widget, + GdkRectangle * background_area, + GdkRectangle * cell_area, + GdkRectangle * expose_area, + GtkCellRendererState flags) +{ + CcDRect const* bounds = cc_item_get_all_bounds(P(renderer)->root, CC_VIEW(renderer)); + cairo_t* cr = gdk_cairo_create(window); + + if(bounds) { + gdk_cairo_rectangle(cr, expose_area); + cairo_clip(cr); + cairo_matrix_init_translate(&P(renderer)->matrix, + cell_area->x - bounds->x1, + cell_area->y - bounds->y1); + cc_item_render(P(renderer)->root, CC_VIEW(renderer), cr); + } + cairo_destroy(cr); } static void @@ -146,5 +195,26 @@ /* CcViewIface */ _cc_view_install_property(go_class, PROP_ROOT, PROP_SCROLLED_REGION, PROP_ZOOM, PROP_ZOOM_MODE, PROP_FOCUS); + + g_type_class_add_private(self_class, sizeof(struct CcViewCellRendererPrivate)); } +/* CcItemViewIface */ +static void +cell_render_implement_item_view(CcItemViewIface* iface G_GNUC_UNUSED) +{} + +/* CcViewIface */ +static void +cell_renderer_world_to_window(CcView const* view, + gdouble * x, + gdouble * y) +{ + cairo_matrix_transform_point(&P(view)->matrix, x, y); +} + +static void +cell_renderer_implement_view(CcViewIface* iface) +{ + iface->world_to_window = cell_renderer_world_to_window; +} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-cell-renderer.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-cell-renderer.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-cell-renderer.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-cell-renderer.h 2006-11-19 00:14:19.000000000 +0000 @@ -48,7 +48,6 @@ gboolean disposed; gdouble zoom; - CcItem * root; }; struct _CcViewCellRendererClass { diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view.h 2006-06-26 15:42:20.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view.h 2007-05-05 15:00:43.000000000 +0100 @@ -58,8 +58,8 @@ CcItem * focus); void cc_view_set_root (CcView * self, CcItem * root); -void cc_view_set_scrolled_region (CcView * self, - CcDRect * scrolled_region); +void cc_view_set_scrolled_region (CcView * self, + CcDRect const* scrolled_region); void cc_view_set_zoom (CcView * self, gdouble zoom); gint cc_view_grab_item (CcView * self, @@ -70,15 +70,15 @@ void cc_view_ungrab_item (CcView * self, CcItem * item, guint32 time); -void cc_view_window_to_world (CcView * self, +void cc_view_window_to_world (CcView const* self, gdouble * x, gdouble * y); -void cc_view_world_to_window (CcView * self, - gdouble* x, - gdouble* y); -void cc_view_world_to_window_distance(CcView * self, - gdouble* x, - gdouble* y); +void cc_view_world_to_window (CcView const* self, + gdouble * x, + gdouble * y); +void cc_view_world_to_window_distance(CcView const* self, + gdouble * x, + gdouble * y); struct _CcViewIface { GTypeInterface base_iface; @@ -92,13 +92,13 @@ void (*ungrab_item) (CcView * self, CcItem * item, guint32 time); - void (*window_to_world) (CcView * self, + void (*window_to_world) (CcView const* self, gdouble * x, gdouble * y); - void (*world_to_window) (CcView * self, + void (*world_to_window) (CcView const* self, gdouble * x, gdouble * y); - void (*world_to_window_distance)(CcView * self, + void (*world_to_window_distance)(CcView const* self, gdouble * x, gdouble * y); }; diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-png.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-png.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-png.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-png.h 2006-11-19 00:14:19.000000000 +0000 @@ -35,7 +35,7 @@ #define CC_VIEW_PNG(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_VIEW_PNG, CcViewPNG)) #define CC_VIEW_PNG_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_VIEW_PNG, CcViewPNGClass)) #define CC_IS_VIEW_PNG(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_VIEW_PNG)) -#define CC_IS_VIEW_PNG_CLAS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_VIEW_PNG)) +#define CC_IS_VIEW_PNG_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_VIEW_PNG)) #define CC_VIEW_PNG_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_VIEW_PNG, CcViewPNGClass)) GType cc_view_png_get_type(void); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-widget.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-widget.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/cc-view-widget.c 2006-08-09 13:59:28.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/cc-view-widget.c 2007-05-05 21:13:25.000000000 +0100 @@ -42,6 +42,8 @@ #endif }; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE ((i), CC_TYPE_VIEW_WIDGET, struct CcViewWidgetPrivate)) + /** * cc_view_widget_get_center_view: * @self: a #CcViewWidget @@ -103,7 +105,10 @@ } static gboolean -cvw_redraw_timeout(CcViewWidget* self) { +cvw_redraw_timeout (CcViewWidget* self) +{ + g_return_val_if_fail (GTK_IS_WIDGET (self), TRUE); + gdk_window_invalidate_region(GTK_WIDGET(self)->window, self->priv->dirty_region, FALSE); gdk_region_destroy(self->priv->dirty_region); @@ -149,7 +154,7 @@ if(G_UNLIKELY(!self->priv->redraw_timeout)) { self->priv->dirty_region = gdk_region_new(); - self->priv->redraw_timeout = g_timeout_add(30, // ~33 FPS + self->priv->redraw_timeout = g_timeout_add(40, // ~25 FPS (GSourceFunc)cvw_redraw_timeout, self); } @@ -164,7 +169,7 @@ static CcDRect const* cvw_get_real_view(CcViewWidget* self) { - CcDRect rect = {0.0, 0.0, 0.0, 0.0}; + static const CcDRect default_view = {0.0, 0.0, 0.0, 0.0}; CcDRect const* retval = NULL; if(self->scrolled_region) { @@ -174,7 +179,7 @@ } if(!retval) { - retval = ▭ + retval = &default_view; } return retval; @@ -281,7 +286,6 @@ "page-size", size, "page-increment", size, "step-increment", size > 20 ? 10.0 : 1.0, -#warning "FIXME: let this scale up to bigger values" NULL); if(update_adjustment) { @@ -367,7 +371,8 @@ } static void -cvw_dispose(GObject* object) { +cvw_dispose (GObject* object) +{ CcViewWidget* self = CC_VIEW_WIDGET(object); if(self->disposed) { return; @@ -384,6 +389,17 @@ } static void +view_widget_finalize (GObject* object) +{ + if (P(object)->redraw_timeout) { + g_source_remove (P(object)->redraw_timeout); + P(object)->redraw_timeout = 0; + } + + G_OBJECT_CLASS (cc_view_widget_parent_class)->finalize (object); +} + +static void cvw_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec) { CcViewWidget* self = CC_VIEW_WIDGET(object); @@ -500,7 +516,9 @@ } static void -cvw_set_scrolled_region(CcViewWidget* self, CcDRect* scrolled_region) { +cvw_set_scrolled_region(CcViewWidget * self, + CcDRect const* scrolled_region) +{ if(self->scrolled_region == scrolled_region) { return; } @@ -591,7 +609,7 @@ if(self->grabbed) { item = self->grabbed; } else { - cc_item_distance(self->root, item_event->button.x, item_event->button.y, &item); + cc_item_distance(self->root, CC_VIEW (self), item_event->button.x, item_event->button.y, &item); } if(item) { g_signal_emit_by_name(item, "event", view, item_event, &retval); @@ -627,7 +645,7 @@ cc_view_window_to_world(CC_VIEW(self), &item_event->motion.x, &item_event->motion.y); if(self->grabbed) { - if(0.0 < cc_item_distance(self->grabbed, item_event->motion.x, item_event->motion.y, &item)) { + if(0.0 < cc_item_distance(self->grabbed, CC_VIEW (self), item_event->motion.x, item_event->motion.y, &item)) { if(self->over_grabbed) { g_signal_emit_by_name(self->grabbed, "event", view, &cr, &retval2); self->over_grabbed = FALSE; @@ -641,7 +659,7 @@ } item = self->grabbed; } else { - cc_item_distance(self->root, item_event->motion.x, item_event->motion.y, &item); + cc_item_distance(self->root, CC_VIEW (self), item_event->motion.x, item_event->motion.y, &item); if(item != self->current) { cc_view_window_to_world(CC_VIEW(self), &cr.x, &cr.y); if(self->current) { @@ -786,7 +804,7 @@ if(!self->v_adjustment && all_bounds) { requisition->height = self->zoom * all_bounds->y2 + 1.0; } else { - requisition->width = 0.0; + requisition->height = 0.0; } } @@ -816,8 +834,7 @@ g_object_unref(*old_adjustment); } - *old_adjustment = g_object_ref(new_adjustment); - gtk_object_sink(GTK_OBJECT(*old_adjustment)); + *old_adjustment = g_object_ref_sink (new_adjustment); g_signal_connect_swapped(*old_adjustment, "changed", G_CALLBACK(cvw_update_matrix), self); @@ -861,6 +878,7 @@ /* GObjectClass */ go_class = G_OBJECT_CLASS(self_class); go_class->dispose = cvw_dispose; + go_class->finalize = view_widget_finalize; go_class->get_property = cvw_get_property; go_class->set_property = cvw_set_property; @@ -990,7 +1008,10 @@ } static void -cvw_window_to_world(CcView* view, gdouble* x, gdouble* y) { +cvw_window_to_world(CcView const* view, + gdouble * x, + gdouble * y) +{ cairo_matrix_t inverse; memcpy(&inverse, &CC_VIEW_WIDGET(view)->display_matrix, sizeof(cairo_matrix_t)); @@ -1000,13 +1021,18 @@ } static void -cvw_world_to_window(CcView* view, gdouble* x, gdouble* y) { +cvw_world_to_window(CcView const* view, + gdouble * x, + gdouble * y) +{ gdouble tx, ty; cairo_matrix_transform_point(&CC_VIEW_WIDGET(view)->display_matrix, x ? x : &tx, y ? y : &ty); } static void -cvw_world_to_window_distance(CcView* view, gdouble* x, gdouble* y) { +cvw_world_to_window_distance(CcView const* view, + gdouble * x, + gdouble * y) { gdouble tx, ty; cairo_matrix_transform_distance(&CC_VIEW_WIDGET(view)->display_matrix, x ? x : &tx, y ? y : &ty); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/gobject-helpers.h /tmp/irThAZDHWn/libccc-0.0.5/ccc/gobject-helpers.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/gobject-helpers.h 2006-06-13 12:02:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/gobject-helpers.h 2007-05-05 14:50:43.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005, 2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -24,6 +24,8 @@ #ifndef GOBJECT_HELPERS_H #define GOBJECT_HELPERS_H +#include + #ifndef G_BOXED_COPY_FUNC #define G_BOXED_COPY_FUNC(f) (GBoxedCopyFunc)(f) #endif /* !G_BOXED_COPY_FUNC */ @@ -32,6 +34,28 @@ #define G_BOXED_FREE_FUNC(f) (GBoxedFreeFunc)(f) #endif /* !G_BOXED_FREE_FUNC */ +#ifndef G_DEFINE_BOXED_TYPE_FULL +#define G_DEFINE_BOXED_TYPE_FULL(TypeName, type_name, copy_func, free_func) \ +GType \ +type_name##_get_type (void) \ +{ \ + static GType type = 0; \ +\ + if (G_UNLIKELY (!type)) { \ + type = g_boxed_type_register_static (#TypeName, \ + G_BOXED_COPY_FUNC (copy_func), \ + G_BOXED_FREE_FUNC (free_func)); \ + } \ +\ + return type; \ +} +#endif + +#ifndef G_DEFINE_BOXED_TYPE +#define G_DEFINE_BOXED_TYPE(TypeName, type_name) \ + G_DEFINE_BOXED_TYPE_FULL(TypeName, type_name, type_name##_copy, type_name##_free) +#endif + #ifndef g_signal_connect_swapped_after #define g_signal_connect_swapped_after(instance, detailed_signal, callback, data) \ g_signal_connect_data((instance), (detailed_signal), (callback), (data), NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED) @@ -68,5 +92,12 @@ #endif /* not defined any of the G_DEFINE_IFACE macros */ +#ifndef _G_TYPE_CGI +#define _G_TYPE_CGI(cp, gt, ct) ((ct*) g_type_interface_peek (((GTypeClass*)cp), gt)) +#endif +#ifndef G_TYPE_CLASS_GET_INTERFACE +#define G_TYPE_CLASS_GET_INTERFACE(clss, type, ctype) _G_TYPE_CGI(clss, type, ctype) +#endif + #endif /* GOBJECT_HELPERS_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/ccc/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/Makefile.am 2006-06-13 12:02:19.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/Makefile.am 2007-05-05 14:51:59.000000000 +0100 @@ -10,26 +10,36 @@ static_headers=\ cc-brush.h \ cc-brush-color.h \ + cc-cairo.h \ + cc-camera.h \ cc-color.h \ cc-color-rgb.c \ + cc-caret.h \ cc-circle.h \ cc-d-rect.h \ + cc-gradient.h \ cc-hash-map.h \ cc-item.h \ cc-item-view.h \ cc-line.h \ + cc-linear-gradient.h \ cc-pixbuf.h \ cc-printer.h \ + cc-radial-gradient.h \ cc-rectangle.h \ cc-rounded-rectangle.h \ cc-shape.h \ + cc-simple-item.h \ cc-text.h \ + cc-unit.h \ cc-utils.h \ cc-view.h \ cc-view-cell-renderer.h \ cc-view-png.h \ cc-view-widget.h \ $(NULL) +private_headers=\ + $(NULL) built_headers=\ cc-enumerations.h \ $(NULL) @@ -47,23 +57,32 @@ $(NULL) libccc_0_1_la_SOURCES=\ $(ccc_HEADERS) \ + $(private_headers) \ $(BUILT_SOURCES) \ cc-brush.c \ cc-brush-color.c \ + cc-cairo.c \ + cc-camera.c \ + cc-caret.c \ cc-color.c \ cc-color-hsv.c \ cc-circle.c \ cc-d-rect.c \ + cc-gradient.c \ cc-hash-map.c \ cc-item.c \ cc-item-view.c \ cc-line.c \ + cc-linear-gradient.c \ cc-pixbuf.c \ cc-printer.c \ + cc-radial-gradient.c \ cc-rectangle.c \ cc-rounded-rectangle.c \ cc-shape.c \ + cc-simple-item.c \ cc-text.c \ + cc-unit.c \ cc-utils.c \ cc-view.c \ cc-view-cell-renderer.c \ @@ -91,13 +110,13 @@ && (cmp -s xgen-cmc $@ || (echo "Creating $@..."; cp xgen-cmc $@) ) \ && rm -f xgen-cmc -cc-enumerations.h: $(static_headers) Makefile cc-enumerations.h.in +cc-enumerations.h: $(static_headers) $(private_headers) Makefile cc-enumerations.h.in @( cd $(srcdir) && $(GLIB_MKENUMS) --template cc-enumerations.h.in \ $(ccc_HEADERS) ) > xgen-gtbh \ && (cmp -s xgen-gtbh $@ || (echo "Creating $@..."; cp xgen-gtbh $@) ) \ && rm -f xgen-gtbh -cc-enumerations.c: $(static_headers) Makefile cc-enumerations.c.in +cc-enumerations.c: $(static_headers) $(private_headers) Makefile cc-enumerations.c.in @( cd $(srcdir) && $(GLIB_MKENUMS) --template cc-enumerations.c.in \ $(ccc_HEADERS) ) >> xgen-gtbc \ && (cmp -s xgen-gtbc $@ || (echo "Creating $@..."; cp xgen-gtbc $@) ) \ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/ccc/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/Makefile.in 2006-09-03 19:57:07.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/Makefile.in 2007-05-05 23:17:40.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,7 @@ @SET_MAKE@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +22,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +35,73 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = ccc +DIST_COMMON = $(ccc_HEADERS) $(main_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cccdir)" \ + "$(DESTDIR)$(maindir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +libccc_0_1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/cdebug/libcdebug.la $(am__DEPENDENCIES_1) +am__objects_1 = +am__objects_2 = cc-color-rgb.lo $(am__objects_1) +am__objects_3 = $(am__objects_1) +am__objects_4 = $(am__objects_2) $(am__objects_3) $(am__objects_1) +am__objects_5 = cc-enumerations.lo $(am__objects_3) cc-marshallers.lo \ + $(am__objects_1) +am_libccc_0_1_la_OBJECTS = $(am__objects_4) $(am__objects_3) \ + $(am__objects_5) cc-brush.lo cc-brush-color.lo cc-cairo.lo \ + cc-camera.lo cc-caret.lo cc-color.lo cc-color-hsv.lo \ + cc-circle.lo cc-d-rect.lo cc-gradient.lo cc-hash-map.lo \ + cc-item.lo cc-item-view.lo cc-line.lo cc-linear-gradient.lo \ + cc-pixbuf.lo cc-printer.lo cc-radial-gradient.lo \ + cc-rectangle.lo cc-rounded-rectangle.lo cc-shape.lo \ + cc-simple-item.lo cc-text.lo cc-unit.lo cc-utils.lo cc-view.lo \ + cc-view-cell-renderer.lo cc-view-png.lo cc-view-widget.lo \ + glib-helpers.lo pango-helpers.lo $(am__objects_1) +libccc_0_1_la_OBJECTS = $(am_libccc_0_1_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libccc_0_1_la_SOURCES) +DIST_SOURCES = $(libccc_0_1_la_SOURCES) +cccHEADERS_INSTALL = $(INSTALL_HEADER) +mainHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(ccc_HEADERS) $(main_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -53,6 +119,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -62,7 +130,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -75,6 +147,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -83,6 +156,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -130,7 +205,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,6 +245,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -184,6 +263,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,6 +290,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -223,32 +305,37 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ NULL = - lib_LTLIBRARIES = libccc-0.1.la - main_HEADERS = \ ccc.h \ $(NULL) maindir = $(includedir)/ccc-$(MILESTONE) - static_headers = \ cc-brush.h \ cc-brush-color.h \ + cc-cairo.h \ + cc-camera.h \ cc-color.h \ cc-color-rgb.c \ + cc-caret.h \ cc-circle.h \ cc-d-rect.h \ + cc-gradient.h \ cc-hash-map.h \ cc-item.h \ cc-item-view.h \ cc-line.h \ + cc-linear-gradient.h \ cc-pixbuf.h \ cc-printer.h \ + cc-radial-gradient.h \ cc-rectangle.h \ cc-rounded-rectangle.h \ cc-shape.h \ + cc-simple-item.h \ cc-text.h \ + cc-unit.h \ cc-utils.h \ cc-view.h \ cc-view-cell-renderer.h \ @@ -256,6 +343,9 @@ cc-view-widget.h \ $(NULL) +private_headers = \ + $(NULL) + built_headers = \ cc-enumerations.h \ $(NULL) @@ -266,7 +356,6 @@ $(NULL) cccdir = $(maindir)/ccc - BUILT_SOURCES = \ cc-enumerations.c \ $(built_headers) \ @@ -276,23 +365,32 @@ libccc_0_1_la_SOURCES = \ $(ccc_HEADERS) \ + $(private_headers) \ $(BUILT_SOURCES) \ cc-brush.c \ cc-brush-color.c \ + cc-cairo.c \ + cc-camera.c \ + cc-caret.c \ cc-color.c \ cc-color-hsv.c \ cc-circle.c \ cc-d-rect.c \ + cc-gradient.c \ cc-hash-map.c \ cc-item.c \ cc-item-view.c \ cc-line.c \ + cc-linear-gradient.c \ cc-pixbuf.c \ cc-printer.c \ + cc-radial-gradient.c \ cc-rectangle.c \ cc-rounded-rectangle.c \ cc-shape.c \ + cc-simple-item.c \ cc-text.c \ + cc-unit.c \ cc-utils.c \ cc-view.c \ cc-view-cell-renderer.c \ @@ -310,19 +408,16 @@ $(top_builddir)/cdebug/libcdebug.la \ $(NULL) - EXTRA_DIST = \ cc-enumerations.c.in \ cc-enumerations.h.in \ marshallers.list \ $(NULL) - CLEANFILES = \ $(BUILT_SOURCES) \ $(NULL) - AM_CPPFLAGS = \ $(CCC_CFLAGS) \ -std=c99 \ @@ -330,105 +425,64 @@ -I$(top_srcdir) \ $(NULL) -subdir = ccc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(lib_LTLIBRARIES) - -libccc_0_1_la_LDFLAGS = -libccc_0_1_la_DEPENDENCIES = $(top_builddir)/cdebug/libcdebug.la -am__objects_1 = -am__objects_2 = cc-color-rgb.lo $(am__objects_1) -am__objects_3 = $(am__objects_1) -am__objects_4 = $(am__objects_2) $(am__objects_3) $(am__objects_1) -am__objects_5 = cc-enumerations.lo $(am__objects_3) cc-marshallers.lo \ - $(am__objects_1) -am_libccc_0_1_la_OBJECTS = $(am__objects_4) $(am__objects_5) cc-brush.lo \ - cc-brush-color.lo cc-color.lo cc-color-hsv.lo cc-circle.lo \ - cc-d-rect.lo cc-hash-map.lo cc-item.lo cc-item-view.lo \ - cc-line.lo cc-pixbuf.lo cc-printer.lo cc-rectangle.lo \ - cc-rounded-rectangle.lo cc-shape.lo cc-text.lo cc-utils.lo \ - cc-view.lo cc-view-cell-renderer.lo cc-view-png.lo \ - cc-view-widget.lo glib-helpers.lo pango-helpers.lo \ - $(am__objects_1) -libccc_0_1_la_OBJECTS = $(am_libccc_0_1_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cc-brush-color.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-brush.Plo ./$(DEPDIR)/cc-circle.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-color-hsv.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-color-rgb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-color.Plo ./$(DEPDIR)/cc-d-rect.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-enumerations.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-hash-map.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-item-view.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-item.Plo ./$(DEPDIR)/cc-line.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-marshallers.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-pixbuf.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-printer.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-rectangle.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-rounded-rectangle.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-shape.Plo ./$(DEPDIR)/cc-text.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-utils.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-view-cell-renderer.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-view-png.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-view-widget.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cc-view.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/glib-helpers.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/pango-helpers.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libccc_0_1_la_SOURCES) -HEADERS = $(ccc_HEADERS) $(main_HEADERS) - -DIST_COMMON = $(ccc_HEADERS) $(main_HEADERS) $(srcdir)/Makefile.in \ - Makefile.am -SOURCES = $(libccc_0_1_la_SOURCES) - all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ccc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu ccc/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -libLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -436,30 +490,38 @@ $(LINK) -rpath $(libdir) $(libccc_0_1_la_LDFLAGS) $(libccc_0_1_la_OBJECTS) $(libccc_0_1_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-brush-color.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-brush.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-cairo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-camera.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-caret.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-circle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-color-hsv.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-color-rgb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-color.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-d-rect.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-enumerations.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-gradient.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-hash-map.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-item-view.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-item.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-line.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-linear-gradient.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-marshallers.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-pixbuf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-printer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-radial-gradient.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-rectangle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-rounded-rectangle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-simple-item.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-text.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-unit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-view-cell-renderer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-view-png.Plo@am__quote@ @@ -469,37 +531,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pango-helpers.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -510,51 +560,41 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -cccHEADERS_INSTALL = $(INSTALL_HEADER) install-cccHEADERS: $(ccc_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(cccdir) + test -z "$(cccdir)" || $(mkdir_p) "$(DESTDIR)$(cccdir)" @list='$(ccc_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(cccHEADERS_INSTALL) $$d$$p $(DESTDIR)$(cccdir)/$$f"; \ - $(cccHEADERS_INSTALL) $$d$$p $(DESTDIR)$(cccdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(cccHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(cccdir)/$$f'"; \ + $(cccHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(cccdir)/$$f"; \ done uninstall-cccHEADERS: @$(NORMAL_UNINSTALL) @list='$(ccc_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(cccdir)/$$f"; \ - rm -f $(DESTDIR)$(cccdir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(cccdir)/$$f'"; \ + rm -f "$(DESTDIR)$(cccdir)/$$f"; \ done -mainHEADERS_INSTALL = $(INSTALL_HEADER) install-mainHEADERS: $(main_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(maindir) + test -z "$(maindir)" || $(mkdir_p) "$(DESTDIR)$(maindir)" @list='$(main_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(mainHEADERS_INSTALL) $$d$$p $(DESTDIR)$(maindir)/$$f"; \ - $(mainHEADERS_INSTALL) $$d$$p $(DESTDIR)$(maindir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(mainHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(maindir)/$$f'"; \ + $(mainHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(maindir)/$$f"; \ done uninstall-mainHEADERS: @$(NORMAL_UNINSTALL) @list='$(main_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(maindir)/$$f"; \ - rm -f $(DESTDIR)$(maindir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(maindir)/$$f'"; \ + rm -f "$(DESTDIR)$(maindir)/$$f"; \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -563,6 +603,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -574,10 +615,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -600,10 +642,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -617,7 +655,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -636,9 +674,10 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(cccdir) $(DESTDIR)$(maindir) + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cccdir)" "$(DESTDIR)$(maindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -660,7 +699,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -681,6 +720,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -719,16 +760,16 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool ctags distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-cccHEADERS install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-mainHEADERS install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-cccHEADERS uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-mainHEADERS + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-cccHEADERS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-libLTLIBRARIES install-mainHEADERS \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-cccHEADERS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-mainHEADERS cc-marshallers.h: $(srcdir)/marshallers.list $(srcdir)/Makefile @@ -742,13 +783,13 @@ && (cmp -s xgen-cmc $@ || (echo "Creating $@..."; cp xgen-cmc $@) ) \ && rm -f xgen-cmc -cc-enumerations.h: $(static_headers) Makefile cc-enumerations.h.in +cc-enumerations.h: $(static_headers) $(private_headers) Makefile cc-enumerations.h.in @( cd $(srcdir) && $(GLIB_MKENUMS) --template cc-enumerations.h.in \ $(ccc_HEADERS) ) > xgen-gtbh \ && (cmp -s xgen-gtbh $@ || (echo "Creating $@..."; cp xgen-gtbh $@) ) \ && rm -f xgen-gtbh -cc-enumerations.c: $(static_headers) Makefile cc-enumerations.c.in +cc-enumerations.c: $(static_headers) $(private_headers) Makefile cc-enumerations.c.in @( cd $(srcdir) && $(GLIB_MKENUMS) --template cc-enumerations.c.in \ $(ccc_HEADERS) ) >> xgen-gtbc \ && (cmp -s xgen-gtbc $@ || (echo "Creating $@..."; cp xgen-gtbc $@) ) \ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/marshallers.list /tmp/irThAZDHWn/libccc-0.0.5/ccc/marshallers.list --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/marshallers.list 2006-06-13 12:02:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/marshallers.list 2007-04-28 20:35:43.000000000 +0100 @@ -3,3 +3,4 @@ VOID:BOXED,BOXED VOID:INT,OBJECT VOID:OBJECT,BOXED +DOUBLE:OBJECT,DOUBLE,DOUBLE,POINTER diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/pango-helpers.c /tmp/irThAZDHWn/libccc-0.0.5/ccc/pango-helpers.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ccc/pango-helpers.c 2006-06-13 12:02:16.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ccc/pango-helpers.c 2007-04-20 09:54:51.000000000 +0100 @@ -50,7 +50,7 @@ layout = pango_layout_new(context); g_object_unref(context); - + return layout; } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/cc-config.h.in /tmp/irThAZDHWn/libccc-0.0.5/cc-config.h.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/cc-config.h.in 2006-09-03 19:57:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/cc-config.h.in 2007-05-05 23:18:27.000000000 +0100 @@ -9,6 +9,9 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET +/* Specify whether callgrind is available for test cases */ +#undef HAVE_CALLGRIND + /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/cdebug/cdebug.c /tmp/irThAZDHWn/libccc-0.0.5/cdebug/cdebug.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/cdebug/cdebug.c 2006-06-13 12:02:21.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/cdebug/cdebug.c 2007-04-20 09:44:43.000000000 +0100 @@ -47,7 +47,7 @@ gchar**contextv = NULL; guint i; - if(contexts) { + if(G_LIKELY(contexts)) { contextv = g_strsplit_set(contexts, CDEBUG_DELIMITERS, -1); pspecs = g_new0(GPatternSpec*, g_strv_length(contextv) + 1); } else { diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/cdebug/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/cdebug/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/cdebug/Makefile.in 2006-09-03 19:57:06.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/cdebug/Makefile.in 2007-05-05 23:17:40.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +34,44 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = cdebug +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = +libcdebug_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libcdebug_la_OBJECTS = cdebug.lo +libcdebug_la_OBJECTS = $(am_libcdebug_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libcdebug_la_SOURCES) +DIST_SOURCES = $(libcdebug_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -53,6 +89,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -62,7 +100,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -75,6 +117,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -83,6 +126,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -130,7 +175,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,6 +215,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -184,6 +233,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,6 +260,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -225,7 +277,6 @@ noinst_LTLIBRARIES = \ libcdebug.la - libcdebug_la_SOURCES = \ cdebug.c \ cdebug.h \ @@ -235,54 +286,50 @@ $(CCC_LIBS) \ $(NULL) - AM_CPPFLAGS = \ $(CCC_CFLAGS) \ -I$(top_srcdir) \ $(NULL) -subdir = cdebug -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) - -libcdebug_la_LDFLAGS = -libcdebug_la_DEPENDENCIES = -am_libcdebug_la_OBJECTS = cdebug.lo $(am__objects_1) -libcdebug_la_OBJECTS = $(am_libcdebug_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cdebug.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libcdebug_la_SOURCES) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(libcdebug_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cdebug/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu cdebug/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -290,7 +337,7 @@ $(LINK) $(libcdebug_la_LDFLAGS) $(libcdebug_la_OBJECTS) $(libcdebug_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -298,37 +345,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdebug.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -340,14 +375,6 @@ -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -356,6 +383,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -367,10 +395,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -393,10 +422,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -410,7 +435,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -428,7 +453,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: install: install-am install-exec: install-exec-am @@ -449,7 +473,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -469,6 +493,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -506,13 +532,14 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ChangeLog /tmp/irThAZDHWn/libccc-0.0.5/ChangeLog --- /tmp/vgIwXsgmrf/libccc-0.0.3/ChangeLog 2006-08-12 09:09:01.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ChangeLog 2007-05-05 16:10:01.000000000 +0100 @@ -1,3 +1,264 @@ +2006-12-04 Sven Herzberg + + * ccc/cc-camera.c: implemented zoom property + * demo/camera.c: set the zoom property manually + +2006-12-03 Sven Herzberg + + * ccc/Makefile.am: updated + * ccc/cc-caret.c, + * ccc/cc-caret.h: added a class for a text cursor + * ccc/cc-line.c: fixed a bug about the item's bounding box + * ccc/cc-shape.c, + * ccc/cc-shape.h: improved the width query function + * ccc/cc-text.c: use the new CcCaret as the text cursor + +2006-12-03 Sven Herzberg + + * python/cccanvas.override, + * python/cccanvasmodule.c: fixed warnings in the python wrapper + +2006-12-03 Sven Herzberg + + * ccc/cc-camera.c: implemented the camera for a first demo + * ccc/cc-item.c: added some documentation + * ccc/cc-text.c: fixed a potential crasher + * ccc/cc-utils.h: added a macro to check a class for an implementation + * ccc/cc-view.c: use the macros for a more advanced warning + * demo/main.c: added the camera demo to the working ones + * doc/reference/ccc-sections.txt: updated and made the iterfaces work + +2006-12-03 Sven Herzberg + + * ccc/cc-camera.c: started implementation + * demo/camera.c, + * demo/crossing.c, + * demo/demo-window.c, + * demo/fifteen-item.c, + * demo/fifteen.c, + * demo/line.c, + * demo/pixbuf-demo.c, + * demo/text-demo.c: improved the code + * doc/reference/ccc-docs.sgml, + * doc/reference/ccc-sections.txt, + * doc/reference/ccc.types: updated + +2006-12-03 Sven Herzberg + + * ccc/Makefile.am: updated + * ccc/ccc.h: updated + * ccc/cc-camera.c, + * ccc/cc-camera.h: started camera code + * demo/Makefile.am: + * demo/camera.c: started working on a camera demo + * demo/credits.c: updated + * demo/credits.h: removed (content is in main.h now) + * demo/demo-window.c: made the code a bit more robust + * demo/main.c: conditionally build unfinished demos + * demo/main.h: added license, camera and credits demo + * demo/zoom-and-scroll.c: added a shadow to the frame of the scrolled + window + * doc/reference/ccc-docs.sgml, + * doc/reference/ccc-sections.txt: added camera stuff + +2006-11-29 Sven Herzberg + + * ccc/cc-text.c: added a property for the caret brush + * demo/text-demo.c: put the border around the text item + +2006-11-29 Sven Herzberg + + * configure.in: added printing dependencies + * demo/Makefile.am, + * demo/main.c, + * demo/main.h, + * demo/printer-demo.c: started working on the printer demo + * demo/pixbuf-demo.c, + * demo/text-demo.c: updated + * demo/text-demo.h: removed + +2006-11-28 Sven Herzberg + + * ccc/cc-line.c: some code cleanup; improved the behaviour + * ccc/cc-text.c: don't create a new CcLine for each rendering cycle, + do it just once + * demo/line.c: fixed an illegal assertion + +2006-11-28 Sven Herzberg + + * ccc/cc-line.c: slightly increased the performance + * ccc/cc-text.c: render the caret with a CcLine now + * doc/reference/ccc-sections.txt: reordered some items + +2006-11-27 Sven Herzberg + + * doc/reference/ccc-sections.txt, + * doc/reference/ccc.types: completed the documentation registration + +2006-11-26 Sven Herzberg + + * ccc/cc-text.c: fixed a bug pointed out by Jean Bréfort + +2006-11-26 Sven Herzberg + + * README: + * ccc/cc-rectangle.c: include the border into the bbox + * configure.in: fixing the check test; preparing for the c# bindings + * Makefile.am, + * csharp/Makefile.am: started stuff for the c# bindings + +2006-11-25 Sven Herzberg + + * ccc/cc-d-rect.h: define the CcDRect earlier. Fixes bug #337488 + (Reported by Alberto Mardegan) + +2006-11-25 Sven Herzberg + + * README: added a nice description + * ccc/cc-view-cell-renderer.c: Removed debugging statements + * ccc/cc-view-widget.c: tries to fix some illegal memory access + * demo/demo-polygon.c: removed debugging statement + * ruby/Makefile.am: compile with -fPIC. Fixes bug #378900 (Reported by + Jean Bréfort) + +2006-11-19 Sven Herzberg + + * test/m-ccc.c: small cleanup + * test/t-text-utf8-editing.c: improved the tests + +2006-11-19 Sven Herzberg + + * configure.in: improved the check test + * test/Makefile.am: updated + * test/glib-helpers.h, + * test/gtk-helpers.c, + * test/gtk-helpers.h: added + * test/m-ccc.c: added test suite + * test/s-text.c, + * test/s-text.h: added text test suite + * test/t-text-utf8-editing.c: added some test cases + +2006-11-19 Sven Herzberg + + * Makefile.am: updated + * configure.in: test for check + * ccc/cc-color-hsv.c: fixed private usage + * demo/text-demo.c: have a nicer text frame in case of focus + * doc/reference/ccc-sections.txt: updated + * test/Makefile.am: new + * test/dummy-test.c: added dummy test + +2006-11-19 Sven Herzberg + + * ccc/cc-color-hsv.c, + * ccc/cc-color-rgb.c, + * ccc/cc-color.h: use GTypePrivate for colors, declare GTypes for them + * ccc/cc-item.c: updated documentation + * ccc/cc-text.c: print a warning when trying to use markup + * ccc/cc-text.h: fixed c++ breakage + * ccc/cc-view-png.h: fixed a typo + * doc/reference/ccc-docs.sgml, + * doc/reference/ccc-sections.txt, + * doc/reference/ccc.types: improved documentation + +2006-11-19 Sven Herzberg + + * TODO: updated + * demo/demo-polygon.c: added border and content color as well as line + width; fixed the bounding box to include all of the border + * demo/main.h: added tree demo + * demo/pixbuf-demo.c: added X and Y test controls + * demo/tree-integration.c: tried to add dnd support + +2006-11-19 Sven Herzberg + + * ccc/cc-pixbuf.c, + * ccc/cc-pixbuf.h: implemented X and Y properties + * ccc/cc-view-cell-renderer.c, + * ccc/cc-view-cell-renderer.h: started to implement the cell renderer + properly + * demo/Makefile.am: updated + * demo/demo-polygon.c, + * demo/demo-polygon.h: added new class + * demo/main.c: display the tree view demo + * demo/main.h: extended for tree demo + * demo/tree-integration.c: extended for polygon support in the tree + * demo/tree-integration.h: removed + +2006-11-19 Sven Herzberg + + * ccc/cc-pixbuf.c: improve rotation and scaling + +# 0.0.4 + +2006-11-19 Sven Herzberg + + * configure.in: release 0.0.4 + +2006-11-19 Sven Herzberg + + * ccc/cc-line.c: fix private use + +2006-11-19 Sven Herzberg + + * ccc/cc-line.c, + * ccc/cc-line.h: use GTypePrivate + +2006-11-18 Sven Herzberg + + * ccc/cc-pixbuf.c: got the bounds management for this item right + +2006-11-18 Sven Herzberg + + * ccc/cc-pixbuf.c: added rotation property and set_dirty() function + * demo/pixbuf-demo.c: added GtkSpinButton for the rotation; fixed a + tab label's title + +2006-11-18 Sven Herzberg + + * ccc/cc-pixbuf.c, + * ccc/cc-pixbuf.h: started to add rotation support; improved the + internal width handling + +2006-11-18 Sven Herzberg + + * ccc/cc-pixbuf.c: added code to also manage automatic sizing + * demo/pixbuf-demo.c: removed size setting code to check automatic + size as well + +2006-11-18 Sven Herzberg + + * ccc/cc-pixbuf.c, + * ccc/cc-pixbuf.h: use GTypePrivate + * demo/Makefile.am: updated + * demo/main.c: added pixbuf demo + * demo/main.h: added new header + * demo/pixbuf-demo.c: added pixbuf demo + * demo/text-demo.c: use static "global" variables + +2006-11-18 Sven Herzberg + + * macros/python.m4: fixed a problem with an underquoted definition + +2006-10-21 Sven Herzberg + + * ccc/cc-brush.c: changed the code to make gapi2-parser work + * csharp/libccc.sources: added foundation for c sharp bindings + +2006-09-04 Sven Herzberg + + * ccc/cc-view-widget.c: reduce the maximum frame rate to 25 FPS + * ccc/gobject-helpers.h: added missing include + * editor/ce-window.c: hide the Close menu item + * editor/herzi-main-window.c: fix the function name + +# 0.0.3 + +2006-09-03 Sven Herzberg + + * NEWS, + * configure.in: release version 0.0.3 + 2006-08-11 Sven Herzberg * ccc/cc-shape.c: fix drawing multiple paths one after the other @@ -395,27 +656,6 @@ for bound caching - which needs more recalculation, but makes the recalculation a LOT faster. So this is the desired way -2006-02-20 Sven Herzberg,,, - - reviewed by: - - * ccc/cc-circle.c: (cc_update_position): - * ccc/cc-item-view.c: (civ_notify_all_bounds), - (cc_item_view_register), (cc_item_view_unregister): - * ccc/cc-item-view.h: - * ccc/cc-item.c: (cc_item_get_all_bounds), (ci_merge_child_bounds), - (ci_notify_all_bounds_real), (cc_item_class_init), - (ci_notify_all_bounds), (ci_init_item_view): - * ccc/cc-item.h: - * ccc/cc-line.c: (cl_check_bounds): - * ccc/cc-rectangle.c: (cr_update_bounds): - * ccc/cc-text.c: (ct_check_all_bounds), (cc_text_set_anchor_type), - (cc_text_set_font_description), (cc_text_set_size_pixels), - (cc_text_set_text), (ct_layout_notify_text): - * ccc/cc-view-widget.c: (cvw_notify_all_bounds), - (cvw_init_item_view): - * doc/reference/ccc-bounds.xml: - 2006-02-18 Sven Herzberg * ccc/cc-item.c, diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/compile /tmp/irThAZDHWn/libccc-0.0.5/compile --- /tmp/vgIwXsgmrf/libccc-0.0.3/compile 2006-06-29 15:53:25.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/compile 2007-04-19 16:00:45.000000000 +0100 @@ -1,8 +1,9 @@ #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. -# Copyright 1999, 2000 Free Software Foundation, Inc. +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,91 +18,125 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -# Usage statement added by Billy Biggs . -if [ -z $1 ]; then - echo "Wrapper for compilers which do not understand '-c -o'." - echo "usage: compile PROGRAM [ARGS]..." - echo "'-o FOO.o' is removed from the args passed to the actual compile." - exit 1 -fi - -prog=$1 -shift +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac ofile= cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we do something ugly here. - ofile=$2 - shift - case "$ofile" in - *.o | *.obj) - ;; - *) - args="$args -o $ofile" - ofile= - ;; - esac - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$prog" $args + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" fi # Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. # Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 +trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. -"$prog" $args -status=$? +"$@" +ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi -rmdir $lockdir -exit $status +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/config.guess /tmp/irThAZDHWn/libccc-0.0.5/config.guess --- /tmp/vgIwXsgmrf/libccc-0.0.3/config.guess 2006-06-29 15:53:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/config.guess 2007-04-19 16:00:46.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -210,7 +211,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -770,6 +771,8 @@ case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -780,9 +783,6 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS_NT-*:*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -790,10 +790,10 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) + x86:Interix*:[3456]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[345]*) + EM64T:Interix*:[3456]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -831,6 +831,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -989,7 +992,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/config.sub /tmp/irThAZDHWn/libccc-0.0.5/config.sub --- /tmp/vgIwXsgmrf/libccc-0.0.3/config.sub 2006-06-29 15:53:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/config.sub 2007-04-19 16:00:46.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -248,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -274,21 +276,19 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -318,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -329,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -358,23 +358,21 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -912,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1128,7 +1130,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1217,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1369,6 +1371,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1378,9 +1386,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/configure /tmp/irThAZDHWn/libccc-0.0.5/configure --- /tmp/vgIwXsgmrf/libccc-0.0.3/configure 2006-09-03 19:56:47.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/configure 2007-05-05 23:17:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -19,10 +20,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -215,7 +219,7 @@ else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -233,7 +237,6 @@ # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -242,10 +245,12 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -253,7 +258,6 @@ CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -262,10 +266,12 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -512,19 +518,28 @@ as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -719,36 +734,36 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include #endif -#if HAVE_STDINT_H +#ifdef HAVE_STDINT_H # include #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include #endif" @@ -800,13 +815,16 @@ AUTOMAKE AUTOHEADER MAKEINFO -AMTAR install_sh STRIP INSTALL_STRIP_PROGRAM +mkdir_p AWK SET_MAKE am__leading_dot +AMTAR +am__tar +am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT @@ -856,6 +874,7 @@ INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS +DATADIRNAME build build_cpu build_vendor @@ -903,14 +922,22 @@ DISTCHECK_CONFIGURE_FLAGS CCC_CFLAGS CCC_LIBS +DEMO_CFLAGS +DEMO_LIBS +CHECK_CFLAGS +CHECK_LIBS +HAVE_CHECK_TRUE +HAVE_CHECK_FALSE +DEVELOPER_TRUE +DEVELOPER_FALSE XARGS USE_NLS MSGFMT +MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT -DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS @@ -937,6 +964,10 @@ PYGTK_DEFSDIR WITH_PYTHON_TRUE WITH_PYTHON_FALSE +MONO +GAPI2_CODEGEN +WITH_MONO_TRUE +WITH_MONO_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -946,6 +977,7 @@ CC CFLAGS LDFLAGS +LIBS CPPFLAGS CPP CXX @@ -957,6 +989,10 @@ PKG_CONFIG CCC_CFLAGS CCC_LIBS +DEMO_CFLAGS +DEMO_LIBS +CHECK_CFLAGS +CHECK_LIBS PYGTK_CFLAGS PYGTK_LIBS' @@ -1064,10 +1100,10 @@ -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -1083,10 +1119,10 @@ -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -1280,19 +1316,19 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1536,10 +1572,10 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1547,6 +1583,8 @@ --disable-libtool-lock avoid locking (might break parallel builds) --enable-gprof Enable gprof (default=off) --enable-gtk-doc use gtk-doc to build documentation default=no + --disable-callgrind disable-callgrind support even if available + --enable-python Enable the python bindings (default: disabled) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1556,12 +1594,14 @@ both] --with-tags[=TAGS] include additional configurations [automatic] --with-html-dir=PATH path to installed docs + --with-check=PATH prefix where check is installed default=auto Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -1573,6 +1613,11 @@ PKG_CONFIG path to pkg-config utility CCC_CFLAGS C compiler flags for CCC, overriding pkg-config CCC_LIBS linker flags for CCC, overriding pkg-config + DEMO_CFLAGS C compiler flags for DEMO, overriding pkg-config + DEMO_LIBS linker flags for DEMO, overriding pkg-config + CHECK_CFLAGS + C compiler flags for CHECK, overriding pkg-config + CHECK_LIBS linker flags for CHECK, overriding pkg-config PYGTK_CFLAGS C compiler flags for PYGTK, overriding pkg-config PYGTK_LIBS linker flags for PYGTK, overriding pkg-config @@ -1641,7 +1686,7 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1655,7 +1700,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2001,7 +2046,7 @@ ac_config_headers="$ac_config_headers cc-config.h" -am__api_version="1.7" +am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2069,7 +2114,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2171,7 +2216,6 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm -f conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -2185,6 +2229,39 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2203,7 +2280,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2266,7 +2343,7 @@ fi rmdir .tst 2>/dev/null - # test to see if srcdir already configured +# test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -2286,7 +2363,7 @@ # Define the identity of the package. PACKAGE=libccc - VERSION=0.0.3 + VERSION=0.0.5 cat >>confdefs.h <<_ACEOF @@ -2314,9 +2391,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -2341,7 +2415,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2381,7 +2455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2425,6 +2499,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2499,7 +2580,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2539,7 +2620,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2596,7 +2677,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2637,7 +2718,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2695,7 +2776,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2739,7 +2820,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2880,7 +2961,7 @@ # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2908,6 +2989,12 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2919,8 +3006,6 @@ fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -3098,27 +3183,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -3173,27 +3241,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3228,27 +3279,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -3284,27 +3318,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3420,27 +3437,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3583,7 +3583,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -3611,9 +3613,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -3645,6 +3652,7 @@ + case "$am__api_version" in 1.01234) { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 @@ -3735,7 +3743,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3798,7 +3806,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3839,7 +3847,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3880,7 +3888,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3921,7 +3929,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3948,6 +3956,149 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + DATADIRNAME=share +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) + { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } +if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. + For example, HP-UX 11i declares gettimeofday. */ +#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char bind_textdomain_codeset (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef bind_textdomain_codeset + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bind_textdomain_codeset (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +choke me +#endif + +int +main () +{ +return bind_textdomain_codeset (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_bind_textdomain_codeset=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } +if test $ac_cv_func_bind_textdomain_codeset = yes; then + DATADIRNAME=share +else + DATADIRNAME=lib +fi + + ;; + *) + DATADIRNAME=lib + ;; + esac +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + + @@ -4188,7 +4339,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4270,7 +4421,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4719,7 +4870,6 @@ # Allow CC to be a program name with arguments. compiler=$CC - # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then enableval=$enable_libtool_lock; @@ -4751,7 +4901,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4754 "configure"' > conftest.$ac_ext + echo '#line 4904 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4875,27 +5025,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 @@ -4904,7 +5038,7 @@ lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4998,17 +5132,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5042,17 +5169,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5117,17 +5237,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5161,17 +5274,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5242,27 +5348,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 @@ -5438,27 +5527,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -5521,27 +5593,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -5577,17 +5632,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5674,7 +5722,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5718,7 +5766,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5831,27 +5879,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -5906,27 +5937,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5961,27 +5975,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -6017,27 +6014,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -6119,7 +6099,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -6147,9 +6129,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -6233,17 +6220,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6277,17 +6257,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6352,17 +6325,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6396,17 +6362,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6447,7 +6406,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -6465,7 +6424,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6491,7 +6450,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6509,7 +6468,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6616,27 +6575,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -6679,27 +6621,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 @@ -7154,7 +7079,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7194,7 +7119,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7250,7 +7175,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7290,7 +7215,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7346,7 +7271,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7386,7 +7311,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7703,11 +7628,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7706: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7631: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7710: \$? = $ac_status" >&5 + echo "$as_me:7635: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7971,11 +7896,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7974: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7899: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7978: \$? = $ac_status" >&5 + echo "$as_me:7903: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8075,11 +8000,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8078: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8082: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8556,27 +8481,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -8590,7 +8499,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8631,27 +8540,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -8665,7 +8558,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -9901,27 +9794,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9930,7 +9807,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10012,27 +9889,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -10041,7 +9902,7 @@ ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -10091,27 +9952,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -10120,7 +9965,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10192,27 +10037,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10221,7 +10050,7 @@ ac_cv_func_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 @@ -10271,27 +10100,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10300,7 +10113,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10351,27 +10164,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10380,7 +10177,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10431,27 +10228,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -10460,7 +10241,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10516,7 +10297,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -11737,7 +11502,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11779,27 +11544,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -11813,7 +11562,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -12984,11 +12733,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12987: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12736: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12991: \$? = $ac_status" >&5 + echo "$as_me:12740: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13088,11 +12837,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13091: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12840: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13095: \$? = $ac_status" >&5 + echo "$as_me:12844: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14649,11 +14398,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14652: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14401: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14656: \$? = $ac_status" >&5 + echo "$as_me:14405: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14753,11 +14502,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14756: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14505: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14760: \$? = $ac_status" >&5 + echo "$as_me:14509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15224,27 +14973,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -15258,7 +14991,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15289,27 +15022,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -15323,7 +15040,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16972,11 +16689,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16975: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16692: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16979: \$? = $ac_status" >&5 + echo "$as_me:16696: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17240,11 +16957,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17243: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16960: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17247: \$? = $ac_status" >&5 + echo "$as_me:16964: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17344,11 +17061,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17347: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17064: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17351: \$? = $ac_status" >&5 + echo "$as_me:17068: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17825,27 +17542,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -17859,7 +17560,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17900,27 +17601,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -17934,7 +17619,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -20059,7 +19744,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RUBY="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20161,27 +19846,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -20217,17 +19885,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20375,7 +20036,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20443,7 +20104,7 @@ fi -DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --disable-scrollkeeper" +DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --disable-scrollkeeper --enable-python" @@ -20469,7 +20130,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20512,7 +20173,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20711,29 +20372,847 @@ +pkg_failed=no +{ echo "$as_me:$LINENO: checking for DEMO" >&5 +echo $ECHO_N "checking for DEMO... $ECHO_C" >&6; } - - HERZI_CFLAGS="" - - for ac_prog in xargs -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_XARGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -n "$PKG_CONFIG"; then + if test -n "$DEMO_CFLAGS"; then + pkg_cv_DEMO_CFLAGS="$DEMO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-unix-print-2.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + gtk+-unix-print-2.0 + ") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DEMO_CFLAGS=`$PKG_CONFIG --cflags " + gtk+-unix-print-2.0 + " 2>/dev/null` else - if test -n "$XARGS"; then - ac_cv_prog_XARGS="$XARGS" # Let the user override the test. + pkg_failed=yes +fi + fi else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$DEMO_LIBS"; then + pkg_cv_DEMO_LIBS="$DEMO_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-unix-print-2.0 + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + gtk+-unix-print-2.0 + ") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DEMO_LIBS=`$PKG_CONFIG --libs " + gtk+-unix-print-2.0 + " 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + DEMO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + gtk+-unix-print-2.0 + "` + else + DEMO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + gtk+-unix-print-2.0 + "` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEMO_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements ( + gtk+-unix-print-2.0 + ) were not met: + +$DEMO_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables DEMO_CFLAGS +and DEMO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements ( + gtk+-unix-print-2.0 + ) were not met: + +$DEMO_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables DEMO_CFLAGS +and DEMO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables DEMO_CFLAGS +and DEMO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables DEMO_CFLAGS +and DEMO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + DEMO_CFLAGS=$pkg_cv_DEMO_CFLAGS + DEMO_LIBS=$pkg_cv_DEMO_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + +# Check whether --enable-callgrind was given. +if test "${enable_callgrind+set}" = set; then + enableval=$enable_callgrind; test_callgrind=$enableval +else + test_callgrind=yes +fi + + +if test "x$test_callgrind" = "xyes"; then + if test "${ac_cv_header_valgrind_callgrind_h+set}" = set; then + { echo "$as_me:$LINENO: checking for valgrind/callgrind.h" >&5 +echo $ECHO_N "checking for valgrind/callgrind.h... $ECHO_C" >&6; } +if test "${ac_cv_header_valgrind_callgrind_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_valgrind_callgrind_h" >&5 +echo "${ECHO_T}$ac_cv_header_valgrind_callgrind_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking valgrind/callgrind.h usability" >&5 +echo $ECHO_N "checking valgrind/callgrind.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking valgrind/callgrind.h presence" >&5 +echo $ECHO_N "checking valgrind/callgrind.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: valgrind/callgrind.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: valgrind/callgrind.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for valgrind/callgrind.h" >&5 +echo $ECHO_N "checking for valgrind/callgrind.h... $ECHO_C" >&6; } +if test "${ac_cv_header_valgrind_callgrind_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_valgrind_callgrind_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_valgrind_callgrind_h" >&5 +echo "${ECHO_T}$ac_cv_header_valgrind_callgrind_h" >&6; } + +fi +if test $ac_cv_header_valgrind_callgrind_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CALLGRIND 1 +_ACEOF + +fi + + +fi + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for CHECK" >&5 +echo $ECHO_N "checking for CHECK... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$CHECK_CFLAGS"; then + pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$CHECK_LIBS"; then + pkg_cv_CHECK_LIBS="$CHECK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.4"` + else + CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.4"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CHECK_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + + + { echo "$as_me:$LINENO: WARNING: AM_PATH_CHECK() is deprecated" >&5 +echo "$as_me: WARNING: AM_PATH_CHECK() is deprecated" >&2;} + { echo "$as_me:$LINENO: WARNING: use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead" >&5 +echo "$as_me: WARNING: use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead" >&2;} + +# Check whether --with-check was given. +if test "${with_check+set}" = set; then + withval=$with_check; +fi + + + min_check_version=0.8.2 + + { echo "$as_me:$LINENO: checking for check - version >= $min_check_version" >&5 +echo $ECHO_N "checking for check - version >= $min_check_version... $ECHO_C" >&6; } + + if test x$with_check = xno; then + { echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6; } + { { echo "$as_me:$LINENO: error: disabling check is not supported" >&5 +echo "$as_me: error: disabling check is not supported" >&2;} + { (exit 1); exit 1; }; } + else + if test "x$with_check" != x; then + CHECK_CFLAGS="-I$with_check/include" + CHECK_LIBS="-L$with_check/lib -lcheck" + else + CHECK_CFLAGS="" + CHECK_LIBS="-lcheck" + fi + + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + + CFLAGS="$CFLAGS $CHECK_CFLAGS" + LIBS="$CHECK_LIBS $LIBS" + + rm -f conf.check-test + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.check-test"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = strdup("$min_check_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_check_version"); + return 1; + } + + if ((CHECK_MAJOR_VERSION != check_major_version) || + (CHECK_MINOR_VERSION != check_minor_version) || + (CHECK_MICRO_VERSION != check_micro_version)) + { + printf("\n*** The check header file (version %d.%d.%d) does not match\n", + CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION); + printf("*** the check library (version %d.%d.%d).\n", + check_major_version, check_minor_version, check_micro_version); + return 1; + } + + if ((check_major_version > major) || + ((check_major_version == major) && (check_minor_version > minor)) || + ((check_major_version == major) && (check_minor_version == minor) && (check_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of check (%d.%d.%d) was found.\n", + check_major_version, check_minor_version, check_micro_version); + printf("*** You need a version of check being at least %d.%d.%d.\n", major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the check library and header\n"); + printf("*** file is being found. Rerun configure with the --with-check=PATH option\n"); + printf("*** to specify the prefix where the correct version was installed.\n"); + } + + return 1; +} + +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + no_check=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + + if test "x$no_check" = x ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + if test -f conf.check-test ; then + : + else + echo "*** Could not run check test program, checking why..." + CFLAGS="$CFLAGS $CHECK_CFLAGS" + LIBS="$CHECK_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding check. You'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for" + echo "*** the exact error that occured." +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + CHECK_CFLAGS="" + CHECK_LIBS="" + + rm -f conf.check-test + { { echo "$as_me:$LINENO: error: check not found" >&5 +echo "$as_me: error: check not found" >&2;} + { (exit 1); exit 1; }; } + fi + + + + + rm -f conf.check-test + + fi + + +elif test $pkg_failed = untried; then + + + { echo "$as_me:$LINENO: WARNING: AM_PATH_CHECK() is deprecated" >&5 +echo "$as_me: WARNING: AM_PATH_CHECK() is deprecated" >&2;} + { echo "$as_me:$LINENO: WARNING: use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead" >&5 +echo "$as_me: WARNING: use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead" >&2;} + +# Check whether --with-check was given. +if test "${with_check+set}" = set; then + withval=$with_check; +fi + + + min_check_version=0.8.2 + + { echo "$as_me:$LINENO: checking for check - version >= $min_check_version" >&5 +echo $ECHO_N "checking for check - version >= $min_check_version... $ECHO_C" >&6; } + + if test x$with_check = xno; then + { echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6; } + { { echo "$as_me:$LINENO: error: disabling check is not supported" >&5 +echo "$as_me: error: disabling check is not supported" >&2;} + { (exit 1); exit 1; }; } + else + if test "x$with_check" != x; then + CHECK_CFLAGS="-I$with_check/include" + CHECK_LIBS="-L$with_check/lib -lcheck" + else + CHECK_CFLAGS="" + CHECK_LIBS="-lcheck" + fi + + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + + CFLAGS="$CFLAGS $CHECK_CFLAGS" + LIBS="$CHECK_LIBS $LIBS" + + rm -f conf.check-test + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.check-test"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = strdup("$min_check_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_check_version"); + return 1; + } + + if ((CHECK_MAJOR_VERSION != check_major_version) || + (CHECK_MINOR_VERSION != check_minor_version) || + (CHECK_MICRO_VERSION != check_micro_version)) + { + printf("\n*** The check header file (version %d.%d.%d) does not match\n", + CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION); + printf("*** the check library (version %d.%d.%d).\n", + check_major_version, check_minor_version, check_micro_version); + return 1; + } + + if ((check_major_version > major) || + ((check_major_version == major) && (check_minor_version > minor)) || + ((check_major_version == major) && (check_minor_version == minor) && (check_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of check (%d.%d.%d) was found.\n", + check_major_version, check_minor_version, check_micro_version); + printf("*** You need a version of check being at least %d.%d.%d.\n", major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the check library and header\n"); + printf("*** file is being found. Rerun configure with the --with-check=PATH option\n"); + printf("*** to specify the prefix where the correct version was installed.\n"); + } + + return 1; +} + +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + no_check=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + + if test "x$no_check" = x ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + if test -f conf.check-test ; then + : + else + echo "*** Could not run check test program, checking why..." + CFLAGS="$CFLAGS $CHECK_CFLAGS" + LIBS="$CHECK_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding check. You'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for" + echo "*** the exact error that occured." +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + CHECK_CFLAGS="" + CHECK_LIBS="" + + rm -f conf.check-test + { { echo "$as_me:$LINENO: error: check not found" >&5 +echo "$as_me: error: check not found" >&2;} + { (exit 1); exit 1; }; } + fi + + + + + rm -f conf.check-test + + fi + + +else + CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS + CHECK_LIBS=$pkg_cv_CHECK_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + + + +if test "x$CHECK_CFLAGS" != "x" -o "x$CHECK_LIBS" != "x"; then + HAVE_CHECK_TRUE= + HAVE_CHECK_FALSE='#' +else + HAVE_CHECK_TRUE='#' + HAVE_CHECK_FALSE= +fi + + + +{ echo "$as_me:$LINENO: checking whether this is a checkout" >&5 +echo $ECHO_N "checking whether this is a checkout... $ECHO_C" >&6; } +if test -d "${srcdir}/.git"; then + ccc_checkout="yes" + { echo "$as_me:$LINENO: result: $ccc_checkout - adding extra checks" >&5 +echo "${ECHO_T}$ccc_checkout - adding extra checks" >&6; } +else + { echo "$as_me:$LINENO: result: $ccc_checkout" >&5 +echo "${ECHO_T}$ccc_checkout" >&6; } +fi + + + +if test "x${ccc_checkout}" = "xyes"; then + DEVELOPER_TRUE= + DEVELOPER_FALSE='#' +else + DEVELOPER_TRUE='#' + DEVELOPER_FALSE= +fi + + +if test "x$ccc_checkout" = "xyes"; then + CFLAGS="${CFLAGS} -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + + + + HERZI_CFLAGS="" + + for ac_prog in xargs +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_XARGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$XARGS"; then + ac_cv_prog_XARGS="$XARGS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XARGS="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20806,27 +21285,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then has_option=yes else echo "$as_me: failed program was:" >&5 @@ -20851,6 +21313,8 @@ CFLAGS="$CFLAGS $HERZI_CFLAGS" +fi + ALL_LINGUAS="de" @@ -20894,27 +21358,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -20950,17 +21397,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21053,27 +21493,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 @@ -21082,7 +21506,7 @@ am_cv_val_LC_MESSAGES=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 @@ -21095,7 +21519,7 @@ fi fi - USE_NLS=yes + USE_NLS=yes gt_cv_have_gettext=no @@ -21138,27 +21562,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -21194,17 +21601,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21295,27 +21695,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then gt_cv_func_ngettext_libc=yes else echo "$as_me: failed program was:" >&5 @@ -21324,7 +21708,7 @@ gt_cv_func_ngettext_libc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -21367,27 +21751,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 @@ -21396,7 +21764,7 @@ gt_cv_func_dgettext_libc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -21472,27 +21840,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -21501,7 +21853,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -21566,27 +21918,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 @@ -21595,7 +21931,7 @@ ac_cv_lib_intl_bindtextdomain=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -21644,27 +21980,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_intl_ngettext=yes else echo "$as_me: failed program was:" >&5 @@ -21673,7 +21993,7 @@ ac_cv_lib_intl_ngettext=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -21722,27 +22042,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 @@ -21751,7 +22055,7 @@ ac_cv_lib_intl_dgettext=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -21813,27 +22117,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_intl_ngettext=yes else echo "$as_me: failed program was:" >&5 @@ -21842,7 +22130,7 @@ ac_cv_lib_intl_ngettext=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -21891,27 +22179,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 @@ -21920,7 +22192,7 @@ ac_cv_lib_intl_dcgettext=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -22015,27 +22287,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -22044,7 +22300,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -22177,41 +22433,25 @@ ; return 0; } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -22220,7 +22460,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -22234,6 +22474,35 @@ fi done + MSGFMT_OPTS= + { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + cat >conftest.foo <<_ACEOF + +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" + +_ACEOF +if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5 + (msgfmt -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +echo "$as_me: failed input was:" >&5 +sed 's/^/| /' conftest.foo >&5 +fi + # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -22252,7 +22521,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22340,27 +22609,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then CATOBJEXT=.gmo DATADIRNAME=share else @@ -22432,27 +22685,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 @@ -22461,7 +22698,7 @@ ac_cv_func_bind_textdomain_codeset=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 @@ -22482,7 +22719,7 @@ esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo @@ -22624,23 +22861,9 @@ - -cat >>confdefs.h <<\_ACEOF -#define PYGTK_REQUIRED_MAJOR_VERSION 2 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define PYGTK_REQUIRED_MINOR_VERSION 8 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define PYGTK_REQUIRED_MICRO_VERSION 0 -_ACEOF - - - +# Check whether --enable-python was given. +if test "${enable_python+set}" = set; then + enableval=$enable_python; @@ -22668,6 +22891,7 @@ { (exit 1); exit 1; }; } fi + am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. @@ -22677,13 +22901,9 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else - for am_cv_pathless_PYTHON in python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 : ; do - if test "$am_cv_pathless_PYTHON" = : ; then - { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 -echo "$as_me: error: no suitable Python interpreter found" >&2;} - { (exit 1); exit 1; }; } - fi - prog="import sys, string + for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. minver = map(int, string.split('2.2', '.')) + [0, 0, 0] @@ -22698,12 +22918,15 @@ break fi - done + done fi { echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } @@ -22721,7 +22944,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22743,10 +22966,17 @@ fi + fi am_display_PYTHON=$am_cv_pathless_PYTHON fi + if test "$PYTHON" = :; then + { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +echo "$as_me: error: no suitable Python interpreter found" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; } @@ -22816,6 +23046,10 @@ + fi + + + { echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` @@ -22847,17 +23081,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then { echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6; } have_python="yes" @@ -22873,12 +23100,32 @@ rm -f conftest.err conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" - -if test x$have_python = xno; then - { echo "$as_me:$LINENO: Python binding is disabled." >&5 -echo "$as_me: Python binding is disabled." >&6;} else + { echo "$as_me:$LINENO: checking whether to build python bindings" >&5 +echo $ECHO_N "checking whether to build python bindings... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: no (disabled)" >&5 +echo "${ECHO_T}no (disabled)" >&6; } + have_python="no" +fi + + + +cat >>confdefs.h <<\_ACEOF +#define PYGTK_REQUIRED_MAJOR_VERSION 2 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define PYGTK_REQUIRED_MINOR_VERSION 8 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define PYGTK_REQUIRED_MICRO_VERSION 0 +_ACEOF + +if test "x$have_python" = "xyes"; then pkg_failed=no { echo "$as_me:$LINENO: checking for PYGTK" >&5 @@ -22938,6 +23185,8 @@ # Put the nasty error message in config.log where it belongs echo "$PYGTK_PKG_ERRORS" >&5 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } have_python="no" { echo "$as_me:$LINENO: result: not found" >&5 @@ -22980,7 +23229,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYGTK_CODEGEN="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23036,7 +23285,100 @@ -ac_config_files="$ac_config_files ccc.pc Makefile ccc/Makefile cdebug/Makefile demo/Makefile doc/Makefile doc/reference/Makefile editor/Makefile po/Makefile.in ruby/Makefile python/Makefile" +# Extract the first word of "mono", so it can be a program name with args. +set dummy mono; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_MONO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MONO in + [\\/]* | ?:[\\/]*) + ac_cv_path_MONO="$MONO" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +MONO=$ac_cv_path_MONO +if test -n "$MONO"; then + { echo "$as_me:$LINENO: result: $MONO" >&5 +echo "${ECHO_T}$MONO" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +# Extract the first word of "gapi2-codegen", so it can be a program name with args. +set dummy gapi2-codegen; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GAPI2_CODEGEN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GAPI2_CODEGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_GAPI2_CODEGEN="$GAPI2_CODEGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GAPI2_CODEGEN="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GAPI2_CODEGEN=$ac_cv_path_GAPI2_CODEGEN +if test -n "$GAPI2_CODEGEN"; then + { echo "$as_me:$LINENO: result: $GAPI2_CODEGEN" >&5 +echo "${ECHO_T}$GAPI2_CODEGEN" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + + +if test "x$MONO" != "x" -a "x$GAPI2_CODEGEN" != "x"; then + WITH_MONO_TRUE= + WITH_MONO_FALSE='#' +else + WITH_MONO_TRUE='#' + WITH_MONO_FALSE= +fi + + + +ac_config_files="$ac_config_files ccc.pc Makefile ccc/Makefile cdebug/Makefile csharp/Makefile demo/Makefile doc/Makefile doc/reference/Makefile editor/Makefile perf/Makefile po/Makefile.in python/Makefile ruby/Makefile test/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -23194,6 +23536,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_CHECK\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_CHECK\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${DEVELOPER_TRUE}" && test -z "${DEVELOPER_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"DEVELOPER\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"DEVELOPER\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${WITH_PYTHON_TRUE}" && test -z "${WITH_PYTHON_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"WITH_PYTHON\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23201,6 +23557,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${WITH_MONO_TRUE}" && test -z "${WITH_MONO_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_MONO\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WITH_MONO\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -23225,7 +23588,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -23234,10 +23598,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -23461,19 +23828,28 @@ as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -23489,7 +23865,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23518,7 +23894,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -23542,7 +23918,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -23668,13 +24044,16 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "ccc/Makefile") CONFIG_FILES="$CONFIG_FILES ccc/Makefile" ;; "cdebug/Makefile") CONFIG_FILES="$CONFIG_FILES cdebug/Makefile" ;; + "csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;; "demo/Makefile") CONFIG_FILES="$CONFIG_FILES demo/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/reference/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/Makefile" ;; "editor/Makefile") CONFIG_FILES="$CONFIG_FILES editor/Makefile" ;; + "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "ruby/Makefile") CONFIG_FILES="$CONFIG_FILES ruby/Makefile" ;; "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; + "ruby/Makefile") CONFIG_FILES="$CONFIG_FILES ruby/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -23786,13 +24165,16 @@ AUTOMAKE!$AUTOMAKE$ac_delim AUTOHEADER!$AUTOHEADER$ac_delim MAKEINFO!$MAKEINFO$ac_delim -AMTAR!$AMTAR$ac_delim install_sh!$install_sh$ac_delim STRIP!$STRIP$ac_delim INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim AWK!$AWK$ac_delim SET_MAKE!$SET_MAKE$ac_delim am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim MAINT!$MAINT$ac_delim @@ -23832,9 +24214,6 @@ INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim -INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -23876,6 +24255,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim +INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim +INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim @@ -23883,6 +24265,7 @@ INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim ALL_LINGUAS!$ALL_LINGUAS$ac_delim +DATADIRNAME!$DATADIRNAME$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim @@ -23930,14 +24313,22 @@ DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim CCC_CFLAGS!$CCC_CFLAGS$ac_delim CCC_LIBS!$CCC_LIBS$ac_delim +DEMO_CFLAGS!$DEMO_CFLAGS$ac_delim +DEMO_LIBS!$DEMO_LIBS$ac_delim +CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim +CHECK_LIBS!$CHECK_LIBS$ac_delim +HAVE_CHECK_TRUE!$HAVE_CHECK_TRUE$ac_delim +HAVE_CHECK_FALSE!$HAVE_CHECK_FALSE$ac_delim +DEVELOPER_TRUE!$DEVELOPER_TRUE$ac_delim +DEVELOPER_FALSE!$DEVELOPER_FALSE$ac_delim XARGS!$XARGS$ac_delim USE_NLS!$USE_NLS$ac_delim MSGFMT!$MSGFMT$ac_delim +MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim GMSGFMT!$GMSGFMT$ac_delim XGETTEXT!$XGETTEXT$ac_delim CATALOGS!$CATALOGS$ac_delim CATOBJEXT!$CATOBJEXT$ac_delim -DATADIRNAME!$DATADIRNAME$ac_delim GMOFILES!$GMOFILES$ac_delim INSTOBJEXT!$INSTOBJEXT$ac_delim INTLLIBS!$INTLLIBS$ac_delim @@ -23961,14 +24352,59 @@ PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim PYGTK_LIBS!$PYGTK_LIBS$ac_delim PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim WITH_PYTHON_TRUE!$WITH_PYTHON_TRUE$ac_delim WITH_PYTHON_FALSE!$WITH_PYTHON_FALSE$ac_delim +MONO!$MONO$ac_delim +GAPI2_CODEGEN!$GAPI2_CODEGEN$ac_delim +WITH_MONO_TRUE!$WITH_MONO_TRUE$ac_delim +WITH_MONO_FALSE!$WITH_MONO_FALSE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -23986,7 +24422,7 @@ fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -24249,7 +24685,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -24440,27 +24876,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -24618,9 +25048,15 @@ echo "libccc configuration:" echo "=====================" echo -echo "Build Ruby Bindings: $have_ruby" +echo "Build Ruby Bindings: $have_ruby" echo "Build Python Bindings: $have_python" -echo "Enable Gprof: $ENABLE_GPROF" +echo "Enable Gprof: $ENABLE_GPROF" +echo -n "Build test system: " +if test "x$CHECK_LIBS" != "x"; then + echo "yes" +else + echo "no" +fi echo echo "CFLAGS: ${CFLAGS}" echo "CCC_CFLAGS: ${CCC_CFLAGS}" diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/configure.in /tmp/irThAZDHWn/libccc-0.0.5/configure.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/configure.in 2006-09-03 19:56:33.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/configure.in 2007-05-05 23:15:57.000000000 +0100 @@ -4,7 +4,7 @@ AC_INIT(ccc) AM_CONFIG_HEADER(cc-config.h) -AM_INIT_AUTOMAKE(libccc,0.0.3) +AM_INIT_AUTOMAKE(libccc,0.0.5) AM_MAINTAINER_MODE AM_ACLOCAL_INCLUDE(macros) @@ -43,7 +43,7 @@ dnl --------- GTK_DOC_CHECK([1.0]) -DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --disable-scrollkeeper" +DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --disable-scrollkeeper --enable-python" AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) dnl ---------------------- @@ -70,14 +70,52 @@ dnl ]])], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no) dnl AC_MSG_ERROR(cairo needs to have PostScript output enabled)]) +PKG_CHECK_MODULES(DEMO,[ + gtk+-unix-print-2.0 + ]) + +AC_ARG_ENABLE([callgrind], + AS_HELP_STRING([--disable-callgrind],[disable-callgrind support even if available]), + [test_callgrind=$enableval], + [test_callgrind=yes]) + +if test "x$test_callgrind" = "xyes"; then + AC_CHECK_HEADER(valgrind/callgrind.h, + [AC_DEFINE(HAVE_CALLGRIND,[1],[Specify whether callgrind is available for test cases])], + []) +fi + +dnl ------------------- +dnl | testing framework |----------------------------------------------------- +dnl ------------------- + +PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[ + ifdef([AM_PATH_CHECK],[AM_PATH_CHECK],[AC_MSG_RESULT([no, testing is disabled])]) + ]) + +AM_CONDITIONAL([HAVE_CHECK],[test "x$CHECK_CFLAGS" != "x" -o "x$CHECK_LIBS" != "x"]) + dnl --------------- dnl | build options |--------------------------------------------------------- dnl --------------- -dnl FIXME: add deprecation guards +AC_MSG_CHECKING([whether this is a checkout]) +if test -d "${srcdir}/.git"; then + ccc_checkout="yes" + AC_MSG_RESULT([$ccc_checkout - adding extra checks]) +else + AC_MSG_RESULT([$ccc_checkout]) +fi + +AM_CONDITIONAL([DEVELOPER],[test "x${ccc_checkout}" = "xyes"]) + +if test "x$ccc_checkout" = "xyes"; then + CFLAGS="${CFLAGS} -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + + HERZI_CHECK_DEVELOP_CFLAGS +fi + dnl FIXME: enable/disable cdebug -dnl FIXME: add check for .svn and CVS directories -HERZI_CHECK_DEVELOP_CFLAGS dnl ------------------------------ dnl | internationalization support |------------------------------------------ @@ -98,19 +136,21 @@ m4_define(pygtk_required_version, pygtk_required_major_version.pygtk_required_minor_version.pygtk_required_micro_version) m4_define(gtk_required_version, 2.8.0) +AC_ARG_ENABLE([python], + AS_HELP_STRING([--enable-python], + [Enable the python bindings (default: disabled)]), + [AM_PATH_PYTHON(2.2) + AM_CHECK_PYTHON_HEADERS([have_python="yes"],[have_python="no"])], + [AC_MSG_CHECKING([whether to build python bindings]) + AC_MSG_RESULT([no (disabled)]) + have_python="no"]) + dnl Define pygtk required version, for runtime check AC_DEFINE(PYGTK_REQUIRED_MAJOR_VERSION, pygtk_required_major_version, [PyGTK required major version]) AC_DEFINE(PYGTK_REQUIRED_MINOR_VERSION, pygtk_required_minor_version, [PyGTK required minor version]) AC_DEFINE(PYGTK_REQUIRED_MICRO_VERSION, pygtk_required_micro_version, [PyGTK required micro version]) -dnl check for python -AM_PATH_PYTHON(2.2) -AM_CHECK_PYTHON_HEADERS([have_python="yes"],[have_python="no"]) - -if test x$have_python = xno; then - AC_MSG_NOTICE([Python binding is disabled.]) -else - +if test "x$have_python" = "xyes"; then dnl check for pygtk PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version,[ have_python="yes" @@ -144,6 +184,15 @@ AM_CONDITIONAL(WITH_PYTHON,[test "x$have_python" = "xyes"]) dnl --------------- +dnl | Mono Bindings |--------------------------------------------------------- +dnl --------------- + +AC_PATH_PROG(MONO,mono) +AC_PATH_PROG(GAPI2_CODEGEN,gapi2-codegen) + +AM_CONDITIONAL(WITH_MONO,[test "x$MONO" != "x" -a "x$GAPI2_CODEGEN" != "x"]) + +dnl --------------- dnl | writing files |--------------------------------------------------------- dnl --------------- @@ -152,13 +201,16 @@ Makefile ccc/Makefile cdebug/Makefile + csharp/Makefile demo/Makefile doc/Makefile doc/reference/Makefile editor/Makefile + perf/Makefile po/Makefile.in + python/Makefile ruby/Makefile - python/Makefile + test/Makefile ]) dnl -------------------- @@ -169,9 +221,15 @@ echo "libccc configuration:" echo "=====================" echo -echo "Build Ruby Bindings: $have_ruby" +echo "Build Ruby Bindings: $have_ruby" echo "Build Python Bindings: $have_python" -echo "Enable Gprof: $ENABLE_GPROF" +echo "Enable Gprof: $ENABLE_GPROF" +echo -n "Build test system: " +if test "x$CHECK_LIBS" != "x"; then + echo "yes" +else + echo "no" +fi echo echo "CFLAGS: ${CFLAGS}" echo "CCC_CFLAGS: ${CCC_CFLAGS}" diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/csharp/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/csharp/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/csharp/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/csharp/Makefile.am 2006-11-25 18:55:58.000000000 +0000 @@ -0,0 +1,4 @@ +if WITH_MONO +libccc.xml: libccc.sources + gapi2-codegen $^ +endif diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/csharp/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/csharp/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/csharp/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/csharp/Makefile.in 2007-05-05 23:17:40.000000000 +0100 @@ -0,0 +1,422 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = csharp +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCC_CFLAGS = @CCC_CFLAGS@ +CCC_LIBS = @CCC_LIBS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ +DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_GPROF = @ENABLE_GPROF@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ +HTML_DIR = @HTML_DIR@ +INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ +INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_ICONV = @INTLTOOL_ICONV@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MILESTONE = @MILESTONE@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_LOCALE_DIR = @PACKAGE_LOCALE_DIR@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_PREFIX = @PACKAGE_PREFIX@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_CODEGEN = @PYGTK_CODEGEN@ +PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RUBY = @RUBY@ +RUBY_ARCHDIR = @RUBY_ARCHDIR@ +RUBY_CFLAGS = @RUBY_CFLAGS@ +RUBY_LIBDIR = @RUBY_LIBDIR@ +RUBY_LIBS = @RUBY_LIBS@ +RUBY_VERSION = @RUBY_VERSION@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ +WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ +WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ +WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ +WITH_RUBY_TRUE = @WITH_RUBY_TRUE@ +XARGS = @XARGS@ +XGETTEXT = @XGETTEXT@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu csharp/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu csharp/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + +@WITH_MONO_TRUE@libccc.xml: libccc.sources +@WITH_MONO_TRUE@ gapi2-codegen $^ +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/debian/changelog /tmp/irThAZDHWn/libccc-0.0.5/debian/changelog --- /tmp/vgIwXsgmrf/libccc-0.0.3/debian/changelog 2007-12-03 15:47:11.000000000 +0000 +++ /tmp/irThAZDHWn/libccc-0.0.5/debian/changelog 2007-12-03 15:47:11.000000000 +0000 @@ -1,3 +1,12 @@ +libccc (0.0.5-0ubuntu1) hardy; urgency=low + + * New upstream release + * Added check python-dev python-gtk2-dev libs to Build-Depends. + * Fixed deprecated $(Source-Version) to $(Source:Version) + * Enabled python-bindings (LP #123175) + + -- Pedro Fragoso Sat, 01 Dec 2007 23:12:31 +0000 + libccc (0.0.3-0ubuntu1) edgy; urgency=low * New upstream release (Malone #59423) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/debian/control /tmp/irThAZDHWn/libccc-0.0.5/debian/control --- /tmp/vgIwXsgmrf/libccc-0.0.3/debian/control 2007-12-03 15:47:11.000000000 +0000 +++ /tmp/irThAZDHWn/libccc-0.0.5/debian/control 2007-12-03 15:47:11.000000000 +0000 @@ -2,7 +2,8 @@ Section: libs Priority: extra Maintainer: Hubert Figuiere -Build-Depends: debhelper (>> 5.0.0), cdbs (>= 0.4.30), libglib2.0-dev (>= 2.10.0), libgtk2.0-dev (>= 2.8.0), intltool +Uploaders: Pedro Fragoso +Build-Depends: debhelper (>> 5.0.0), cdbs (>= 0.4.30), libglib2.0-dev (>= 2.10.0), libgtk2.0-dev (>= 2.10.0), intltool, check (>= 0.9.4), python2.5-dev (>= 2.5), python-gtk2-dev (>= 2.10.0) Standards-Version: 3.7.2 Package: libccc-doc @@ -18,7 +19,7 @@ Section: libdevel Architecture: any Suggests: libccc-doc -Depends: libccc-0.1-0 (= ${Source-Version}), libc6-dev, libgtk2.0-dev (>= 2.8.0), libglib2.0-dev (>= 2.10.0) +Depends: libccc-0.1-0 (= ${Source:Version}), libc6-dev, libgtk2.0-dev (>= 2.8.0), libglib2.0-dev (>= 2.10.0), python2.5-dev (>= 2.5), python-gtk2-dev (>= 2.10.0) Description: A Cairo based Canvas - Development Files Criawips Cairo Canvas is a Cairo based canvas with a MVC inspired by GnomeCanvas, and developed for Criawips. @@ -27,7 +28,7 @@ Package: libccc-0.1-0-dbg Architecture: any -Depends: libccc-0.1-0 (= ${Source-Version}) +Depends: libccc-0.1-0 (= ${Source:Version}) Description: A Cairo based Canvas - Debug Files Criawips Cairo Canvas is a Cairo based canvas with a MVC inspired by GnomeCanvas, and developed for Criawips. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/debian/rules /tmp/irThAZDHWn/libccc-0.0.5/debian/rules --- /tmp/vgIwXsgmrf/libccc-0.0.3/debian/rules 2007-12-03 15:47:11.000000000 +0000 +++ /tmp/irThAZDHWn/libccc-0.0.5/debian/rules 2007-12-03 15:47:11.000000000 +0000 @@ -2,6 +2,7 @@ DEB_DH_INSTALL_SOURCEDIR=debian/tmp DEB_DH_STRIP_ARGS := --dbg-package=libccc-0.1-0-dbg +DEB_CONFIGURE_USER_FLAGS = --enable-python include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/animation.c /tmp/irThAZDHWn/libccc-0.0.5/demo/animation.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/animation.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/animation.c 2007-05-05 21:52:00.000000000 +0100 @@ -0,0 +1,61 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "main.h" + +#include +#include + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +static gint step = 0; + +static gboolean +animate(gpointer data) +{ + CcText* text = data; + gdouble pos = 100.0*(step > 100 ? 200 - step : step)/100-50.0; + cc_text_set_anchor(text, pos, text->y); + step = (step+1)%200; + return TRUE; +} + +DemoPage* +animation_demo(void) +{ + GtkWidget* view = cc_view_widget_new(); + CcItem * root = cc_item_new(); + CcItem * text = cc_text_new(PACKAGE " " VERSION); + cc_view_set_root(CC_VIEW(view), root); + cc_item_append(root, text); + cc_text_set_anchor_type(CC_TEXT(text), GTK_ANCHOR_CENTER); + cc_view_set_scrolled_region(CC_VIEW(view), cc_item_get_all_bounds(root, CC_VIEW(view))); + g_timeout_add(30, animate, text); + return demo_page_new(view, _("Animation")); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/camera.c /tmp/irThAZDHWn/libccc-0.0.5/demo/camera.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/camera.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/camera.c 2007-04-20 09:54:51.000000000 +0100 @@ -0,0 +1,85 @@ +/* This file is part of CCC, a cairo-based canvas + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "main.h" + +#include +#include +#include +#include +#include +#include +#include "demo-canvas.h" + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +/* Camera Demo + * + * This demo is supposed to create a very nice demonstration of the camera + * possibilities. + * + * Desired end result: + * ------------------- + * We want to display a canvas (either the current demo canvas or a fancy large + * graph). The general idea is to have this canvas larger than the scrollable + * area. Then we want to have some kind of "overview area" (in the corner) that + * displays the whole canvas together with a nice rectangle visualizing the + * currently visible area. + * + * This rectangle could also be draggable to adjust the currently visible area. + * + * (Extra bonus: render the visible area a bit more opaque than the rest) + * (Extra bonus 2: render a shadow for the preview) + */ + +static CcItem* +camera_canvas_new(void) +{ + CcItem* canvas = cc_item_new(); + CcItem* demo = demo_canvas_create(); + CcItem* camera = cc_camera_new_root(demo); + CcItem* handle = cc_circle_new (); + cc_view_set_zoom(CC_VIEW(camera), 0.25); + cc_circle_set_radius (CC_CIRCLE (handle), 5.0); + cc_circle_set_anchor (CC_CIRCLE (handle), 100.0, 100.0); + cc_shape_set_brush_content (CC_SHAPE (handle), cc_brush_color_new (cc_color_new_rgb (0.64, 0.0, 0.0))); + cc_item_append(canvas, demo); + cc_item_append(canvas, camera); + cc_item_append (canvas, handle); + return canvas; +} + +DemoPage* +camera_demo(void) +{ + GtkWidget* swin = gtk_scrolled_window_new(NULL, NULL); + GtkWidget* widget = cc_view_widget_new_root(camera_canvas_new()); + gtk_container_add(GTK_CONTAINER(swin), widget); + return demo_page_new(swin, _("Cameras")); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/credits.c /tmp/irThAZDHWn/libccc-0.0.5/demo/credits.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/credits.c 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/credits.c 2006-12-02 23:24:28.000000000 +0000 @@ -21,7 +21,7 @@ * USA */ -#include "credits.h" +#include "main.h" #include diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/credits.h /tmp/irThAZDHWn/libccc-0.0.5/demo/credits.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/credits.h 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/credits.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -/* this file is part of libccc, criawips' cairo-based canvas - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2005 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef CREDITS_H -#define CREDITS_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* credits(void); - -G_END_DECLS - -#endif /* CREDITS_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/crossing.c /tmp/irThAZDHWn/libccc-0.0.5/demo/crossing.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/crossing.c 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/crossing.c 2007-04-24 15:19:34.000000000 +0100 @@ -1,9 +1,9 @@ -/* This file is part of ccc +/* This file is part of libccc * * AUTHORS * Sven Herzberg * - * Copyright (C) 2006 Sven Herzberg + * Copyright (C) 2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -21,7 +21,7 @@ * USA */ -#include "crossing.h" +#include "main.h" #include #include @@ -29,6 +29,11 @@ #include #include +#ifdef HAVE_CONFIG_H +# include +#endif +#include + static gboolean enter_callback(CcShape* shape, CcView* view, GdkEventCrossing* ev) { CcColor* color = cc_color_new_rgb(1.0, 0.0, 0.0); @@ -47,7 +52,6 @@ DemoPage* crossing(void) { - DemoPage* retval = g_new(DemoPage, 1); CcItem* root = cc_item_new(); GtkWidget* view = cc_view_widget_new_root(root); gint i; @@ -55,9 +59,8 @@ CcBrush* brush = cc_brush_color_new(color); GtkWidget* swin = gtk_scrolled_window_new(NULL, NULL); + DemoPage* retval = demo_page_new(gtk_vbox_new(FALSE, 6), _("Crossing")); - retval->title = "Crossing"; - retval->widget = gtk_vbox_new(FALSE, 6); gtk_container_set_border_width(GTK_CONTAINER(retval->widget), 6); gtk_box_pack_start_defaults(GTK_BOX(retval->widget), swin); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/crossing.h /tmp/irThAZDHWn/libccc-0.0.5/demo/crossing.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/crossing.h 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/crossing.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -/* This file is part of ccc - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2006 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef CROSSING_H -#define CROSSING_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* crossing(void); - -G_END_DECLS - -#endif /* !CROSSING_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-page.c /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-page.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-page.c 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-page.c 2007-04-20 09:44:43.000000000 +0100 @@ -27,7 +27,7 @@ demo_page_new(GtkWidget* w, gchar const* text) { DemoPage* page = g_object_new(DEMO_TYPE_PAGE, NULL); page->widget = w; - page->title = text; + page->title = g_strdup(text); return page; } @@ -38,5 +38,19 @@ demo_page_init(DemoPage* self) {} static void -demo_page_class_init(DemoPageClass* self_class) {} +page_finalize(GObject* object) +{ + DemoPage* self = DEMO_PAGE(object); + + g_free(self->title); + self->title = NULL; + + G_OBJECT_CLASS(demo_page_parent_class)->finalize(object); +} + +static void +demo_page_class_init(DemoPageClass* self_class) { + GObjectClass* object_class = G_OBJECT_CLASS(self_class); + object_class->finalize = page_finalize; +} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-page.h /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-page.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-page.h 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-page.h 2007-04-20 09:44:43.000000000 +0100 @@ -32,7 +32,7 @@ typedef struct _DemoPageClass DemoPageClass; #define DEMO_TYPE_PAGE (demo_page_get_type()) -#define DEMO_PAGE(i) (G_TYPE_CHECK_INSTANCE_CAST((i), DMEO_TYPE_PAGE, DemoPage)) +#define DEMO_PAGE(i) (G_TYPE_CHECK_INSTANCE_CAST((i), DEMO_TYPE_PAGE, DemoPage)) #define DEMO_PAGE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), DEMO_TYPE_PAGE, DemoPageClass)) #define DEMO_IS_PAGE(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), DEMO_TYPE_PAGE)) #define DEMO_IS_PAGE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), DEMO_TYPE_PAGE)) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-polygon.c /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-polygon.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-polygon.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-polygon.c 2007-04-24 13:32:52.000000000 +0100 @@ -0,0 +1,185 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "demo-polygon.h" + +#include +#include + +struct DemoPolygonPrivate { + gint n_edges; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), DEMO_TYPE_POLYGON, struct DemoPolygonPrivate)) + +CcItem* +demo_polygon_new(gint n) +{ + return g_object_new(DEMO_TYPE_POLYGON, "n-edges", n, NULL); +} + +/* GType */ +G_DEFINE_TYPE(DemoPolygon, demo_polygon, CC_TYPE_SHAPE); + +enum { + PROP_0, + PROP_N_EDGES +}; + +static void +demo_polygon_init(DemoPolygon* self) +{ + cc_shape_set_width_pixels(CC_SHAPE(self), 3.0); + cc_shape_set_brush_border (CC_SHAPE(self), cc_brush_color_new(cc_color_new_rgb(0.254, 0.395, 0.64))); + cc_shape_set_brush_content(CC_SHAPE(self), cc_brush_color_new(cc_color_new_rgb(0.984, 0.68, 0.25))); +} + +static void +polygon_get_property(GObject * object, + guint prop_id, + GValue * value, + GParamSpec* pspec) +{ + switch(prop_id) { + case PROP_N_EDGES: + g_value_set_int(value, P(object)->n_edges); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static void +polygon_set_property(GObject * object, + guint prop_id, + GValue const* value, + GParamSpec * pspec) +{ + switch(prop_id) { + case PROP_N_EDGES: + if(P(object)->n_edges == g_value_get_int(value)) { + break; + } + P(object)->n_edges = g_value_get_int(value); + g_object_notify(object, "n-edges"); + cc_item_update_bounds(CC_ITEM(object), NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static void +polygon_update_bounds(CcItem * item, + CcView const* view, + gpointer data) +{ + CcDRect* bounds = cc_hash_map_lookup(item->bounds, view); + CcDRect drect = {0.0, 0.0, 0.0, 0.0}; + gdouble offset; + gint i; + + if(P(item)->n_edges % 2) { + offset = 0.0; + } + else { + offset = 2*G_PI / P(item)->n_edges / 2; + } +#define radius 20.0 + drect.x1 = radius * sin(offset) - cc_shape_get_width(CC_SHAPE(item), view); + drect.x2 = radius * sin(offset) + cc_shape_get_width(CC_SHAPE(item), view); + drect.y1 = radius * sin(offset) - cc_shape_get_width(CC_SHAPE(item), view); + drect.y2 = radius * cos(offset) + cc_shape_get_width(CC_SHAPE(item), view); + + for(i = 1; i < P(item)->n_edges; i++) { + gdouble x = radius * sin(offset + i*2*G_PI/P(item)->n_edges); + gdouble y = radius * cos(offset + i*2*G_PI/P(item)->n_edges); + drect.x1 = MIN(drect.x1, x - cc_shape_get_width(CC_SHAPE(item), view)); + drect.y1 = MIN(drect.y1, y - cc_shape_get_width(CC_SHAPE(item), view)); + drect.x2 = MAX(drect.x2, x + cc_shape_get_width(CC_SHAPE(item), view)); + drect.y2 = MAX(drect.y2, y + cc_shape_get_width(CC_SHAPE(item), view)); + } + + if(!bounds || !cc_d_rect_equal(*bounds, drect)) { + if(bounds) { + cc_item_dirty(item, view, *bounds); + cc_hash_map_remove(item->bounds, view); + } + + cc_hash_map_insert(item->bounds, (gpointer)view, cc_d_rect_copy(&drect)); + + cc_item_dirty(item, view, drect); + cc_item_bounds_changed(item, view); + } +} + +static void +polygon_path(CcShape* shape, + CcView * view, + cairo_t* cr) +{ + gdouble offset; + gint i; + + if(P(shape)->n_edges % 2) { + offset = 0.0; + } + else { + offset = 2*G_PI / P(shape)->n_edges / 2; + } +#define radius 20.0 + cairo_new_path(cr); + + for(i = 0; i < P(shape)->n_edges; i++) { + gdouble x = radius * sin(offset + i*2*G_PI/P(shape)->n_edges); + gdouble y = radius * cos(offset + i*2*G_PI/P(shape)->n_edges); + cc_view_world_to_window(view, &x, &y); + cairo_line_to(cr, x, y); + } + cairo_close_path(cr); +} + +static void +demo_polygon_class_init(DemoPolygonClass* self_class) +{ + GObjectClass* object_class = G_OBJECT_CLASS(self_class); + CcItemClass * item_class = CC_ITEM_CLASS(self_class); + CcShapeClass* shape_class = CC_SHAPE_CLASS(self_class); + + object_class->get_property = polygon_get_property; + object_class->set_property = polygon_set_property; + g_object_class_install_property(object_class, PROP_N_EDGES, + g_param_spec_int("n-edges", + _("N Edges"), + _("The number of edges (or corners) of this polygon"), + 3, G_MAXINT, + 3, G_PARAM_READWRITE)); + + item_class->update_bounds = polygon_update_bounds; + + shape_class->path = polygon_path; + + g_type_class_add_private(self_class, sizeof(struct DemoPolygonPrivate)); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-polygon.h /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-polygon.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-polygon.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-polygon.h 2007-04-24 13:32:52.000000000 +0100 @@ -0,0 +1,42 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef DEMO_POLYGON_H +#define DEMO_POLYGON_H + +#include +#include + +G_BEGIN_DECLS + +typedef CcShape DemoPolygon; +typedef CcShapeClass DemoPolygonClass; + +#define DEMO_TYPE_POLYGON (demo_polygon_get_type()) + +GType demo_polygon_get_type(void); +CcItem* demo_polygon_new (gint i); + +G_END_DECLS + +#endif /* !DEMO_POLYGON_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-window.c /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-window.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/demo-window.c 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/demo-window.c 2007-05-05 14:50:44.000000000 +0100 @@ -28,12 +28,18 @@ #include #include #include +#include #include #include #include #include +#ifdef HAVE_CONFIG_H +# include +#endif +#include + enum { COL_TEXT, COL_PAGE, @@ -53,6 +59,14 @@ void demo_window_add(DemoWindow* self, DemoPage* page) { GtkTreeIter iter; + g_return_if_fail(DEMO_IS_PAGE(page)); + g_return_if_fail(GTK_IS_WIDGET(page->widget)); + +#ifndef G_DISABLE_CHECKS + if(G_UNLIKELY(!page->title)) { + page->title = _("Untitled Page"); + } +#endif self->pages = g_list_prepend(self->pages, page); gint insert_id = gtk_notebook_append_page(GTK_NOTEBOOK(self->notebook), page->widget, gtk_label_new(page->title)); @@ -78,8 +92,11 @@ static void demo_window_init(DemoWindow* self) { GtkWidget* paned = gtk_hpaned_new(); + GtkWidget* swin = gtk_scrolled_window_new(NULL, NULL); GtkTreeModel* model; + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); + self->treemodel = GTK_TREE_MODEL(gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_INT)); model = gtk_tree_model_sort_new_with_model(self->treemodel); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), COL_TEXT, GTK_SORT_ASCENDING); @@ -89,7 +106,8 @@ "text", COL_TEXT, NULL); gtk_widget_show(self->treeview); - gtk_paned_pack1(GTK_PANED(paned), self->treeview, FALSE, FALSE); + gtk_container_add(GTK_CONTAINER(swin), self->treeview); + gtk_paned_pack1(GTK_PANED(paned), swin, FALSE, FALSE); self->notebook = gtk_notebook_new(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(self->notebook), FALSE); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/fifteen.c /tmp/irThAZDHWn/libccc-0.0.5/demo/fifteen.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/fifteen.c 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/fifteen.c 2007-04-20 09:54:22.000000000 +0100 @@ -21,20 +21,23 @@ * USA */ -#include "fifteen.h" +#include "main.h" #include #include #include "fifteen-grid.h" +#ifdef HAVE_CONFIG_H +# include +#endif +#include + DemoPage* fifteen(void) { - DemoPage * page = g_new(DemoPage, 1); + DemoPage * page = demo_page_new(gtk_vbox_new(FALSE, 6), _("Fifteen")); GtkWidget* widget; CcItem * canvas; - page->title = "Fifteen"; - page->widget = gtk_vbox_new(FALSE, 6); gtk_container_set_border_width(GTK_CONTAINER(page->widget), 6); widget = cc_view_widget_new(); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/fifteen.h /tmp/irThAZDHWn/libccc-0.0.5/demo/fifteen.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/fifteen.h 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/fifteen.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* this file is part of libccc, criawips' cairo-based canvas - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2005 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef FIFTEEN_H -#define FIFTEEN_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* fifteen(void); - -G_END_DECLS - -#endif /* !FIFTEEN_H */ - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/fifteen-item.c /tmp/irThAZDHWn/libccc-0.0.5/demo/fifteen-item.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/fifteen-item.c 2006-07-14 17:27:27.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/fifteen-item.c 2007-05-05 21:52:00.000000000 +0100 @@ -59,14 +59,22 @@ CC_ITEM_SET_FLAGS(self, CC_CAN_FOCUS); } -static void -fi_focus_enter(CcItem* self, CcView* view) { +static gboolean +fi_focus_enter(CcItem * self, + CcView * view, + GdkEventFocus* ev G_GNUC_UNUSED) +{ g_message("Focus on '%s'", pango_layout_get_text(CC_TEXT(FIFTEEN_ITEM(self)->text)->layout)); + return FALSE; } -static void -fi_focus_leave(CcItem* self, CcView* view) { +static gboolean +fi_focus_leave(CcItem * self, + CcView * view, + GdkEventFocus* ev G_GNUC_UNUSED) +{ g_message("Focus off '%s'", pango_layout_get_text(CC_TEXT(FIFTEEN_ITEM(self)->text)->layout)); + return FALSE; } static void diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/gradient.c /tmp/irThAZDHWn/libccc-0.0.5/demo/gradient.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/gradient.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/gradient.c 2007-05-05 22:05:23.000000000 +0100 @@ -0,0 +1,262 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "main.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +#undef DEBUG_GRADIENT + +static CcItem* rrect = NULL; +static CcItem* text = NULL; +static CcItem* knobs[3] = {}; +static gdouble offset = 0.25; +static CcDRect rect = {}; + +static void +update_stops(void) +{ + CcBrush* brush = cc_linear_gradient_new(rect.x1, rect.y1, rect.x2, rect.y2); + cc_shape_set_brush_content(CC_SHAPE(rrect), brush); + cc_gradient_add_stop(CC_GRADIENT(brush), 0.0, cc_color_new_rgba(0.925, 0.16, 0.16, 0.75)); + cc_gradient_add_stop(CC_GRADIENT(brush), offset, cc_color_new_rgba(0.65, 0.0, 0.0, 1.0)); + cc_gradient_add_stop(CC_GRADIENT(brush), 1.0, cc_color_new_rgba(0.925, 0.16, 0.16, 0.75)); +} + +static void +update_box(void) +{ + rect.x1 = (CC_CIRCLE(knobs[0])->x - CC_RECTANGLE(rrect)->x)/(CC_RECTANGLE(rrect)->w - CC_RECTANGLE(rrect)->x); + rect.y1 = (CC_CIRCLE(knobs[0])->y - CC_RECTANGLE(rrect)->y)/(CC_RECTANGLE(rrect)->h - CC_RECTANGLE(rrect)->y); + rect.x2 = (CC_CIRCLE(knobs[2])->x - CC_RECTANGLE(rrect)->x)/(CC_RECTANGLE(rrect)->w - CC_RECTANGLE(rrect)->x); + rect.y2 = (CC_CIRCLE(knobs[2])->y - CC_RECTANGLE(rrect)->y)/(CC_RECTANGLE(rrect)->h - CC_RECTANGLE(rrect)->y); + cc_circle_set_anchor(CC_CIRCLE(knobs[1]), + CC_CIRCLE(knobs[0])->x + offset * (CC_CIRCLE(knobs[2])->x - CC_CIRCLE(knobs[0])->x), + CC_CIRCLE(knobs[0])->y + offset * (CC_CIRCLE(knobs[2])->y - CC_CIRCLE(knobs[0])->y)); + update_stops(); +} + +static void +update_offset(gdouble x, + gdouble y) +{ + // FIXME: this calculation should be replaced by a correct one + gdouble diff0, + diff1, + diff2; + diff0 = hypot(x - CC_CIRCLE(knobs[0])->x, + y - CC_CIRCLE(knobs[0])->y); + diff1 = hypot(CC_CIRCLE(knobs[2])->x - CC_CIRCLE(knobs[0])->x, + CC_CIRCLE(knobs[2])->y - CC_CIRCLE(knobs[0])->y); + diff2 = hypot(x - CC_CIRCLE(knobs[2])->x, + y - CC_CIRCLE(knobs[2])->y); + offset = CLAMP(diff0 / (diff0 + diff2), 0.0, 1.0); + cc_circle_set_anchor(CC_CIRCLE(knobs[1]), + CC_CIRCLE(knobs[0])->x + offset * (CC_CIRCLE(knobs[2])->x - CC_CIRCLE(knobs[0])->x), + CC_CIRCLE(knobs[0])->y + offset * (CC_CIRCLE(knobs[2])->y - CC_CIRCLE(knobs[0])->y)); + update_stops(); +} + +static gboolean +knob_button_press_event(CcCircle * knob, + CcView * view, + GdkEventButton* event) +{ + gdouble* offset = g_new0(gdouble, 2); + offset[0] = knob->x - event->x; + offset[1] = knob->y - event->y; + g_object_set_data_full(G_OBJECT(knob), "CccDemoKnobOffset", offset, g_free); + cc_view_grab_item(view, CC_ITEM(knob), GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK, + gdk_cursor_new(GDK_CROSSHAIR), event->time); + return TRUE; +} + +static gboolean +knob_button_release_event(CcItem * knob, + CcView * view, + GdkEventButton* ev) +{ + gdouble* offset = g_object_get_data(G_OBJECT(knob), "CccDemoKnobOffset"); + if(knob == knobs[0] || knob == knobs[2]) { + cc_circle_set_anchor(CC_CIRCLE(knob), ev->x + offset[0], ev->y + offset[1]); + update_box(); + } + else { + update_offset(ev->x, ev->y); + } + g_object_set_data(G_OBJECT(knob), "CccDemoKnobOffset", NULL); + cc_view_ungrab_item(view, CC_ITEM(knob), ev->time); + return TRUE; +} + +static gboolean +knob_motion_notify_event(CcItem * knob, + CcView * view, + GdkEventMotion* ev) +{ + gdouble* offset = g_object_get_data(G_OBJECT(knob), "CccDemoKnobOffset"); + if(G_LIKELY(offset)) { + if(knob == knobs[0] || knob == knobs[2]) { + cc_circle_set_anchor(CC_CIRCLE(knob), ev->x + offset[0], ev->y + offset[1]); + update_box(); + } + else { + update_offset(ev->x, ev->y); + } + return TRUE; + } + return FALSE; +} + +#ifdef DEBUG_GRADIENT +static void +item_debug_bounds(CcItem* item, + CcView* view) +{ + CcDRect const* drect = cc_item_get_all_bounds(item, view); + g_return_if_fail(drect); + g_debug("%p: Bounds: (%.0fx%.0f) => (%.0fx%.0f)", + item, drect->x1, drect->y1, drect->x2, drect->y2); +} +#endif + +static void +view_size_allocate(GtkWidget * widget, + GtkAllocation* allocation) +{ +#ifdef DEBUG_GRADIENT + g_debug("start resize (%dx%d) => (%dx%d)", + allocation->x, allocation->y, + allocation->x + allocation->width - 1, + allocation->y + allocation->height - 1); + item_debug_bounds(rrect, CC_VIEW(widget)); +#endif + cc_rectangle_set_position(CC_RECTANGLE(rrect), + 0.0, 0.0, + allocation->width - 50, + allocation->height - 50); +#ifdef DEBUG_GRADIENT + item_debug_bounds(rrect, CC_VIEW(widget)); + g_debug("end resize"); +#endif + + cc_text_set_anchor(CC_TEXT(text), + 0.5 * (allocation->width - 50), + allocation->height - 65); + cc_circle_set_anchor(CC_CIRCLE(knobs[0]), + rect.x1 * (allocation->width - 50), + rect.y1 * (allocation->height - 50)); + cc_circle_set_anchor(CC_CIRCLE(knobs[2]), + rect.x2 * (allocation->width - 50), + rect.y2 * (allocation->height - 50)); + update_box(); +} + +DemoPage* +gradient_demo(void) +{ + GtkWidget* widget; + CcBrush * brush; + CcBrush * brush2; + CcItem * root = cc_item_new(); + + rrect = cc_rounded_rectangle_new(); + CC_ITEM_SET_FLAGS(rrect, CC_GRID_ALIGNED); + cc_shape_set_brush_border(CC_SHAPE(rrect), cc_brush_color_new(cc_color_new_rgb(0.8, 0.1, 0.2))); + cc_shape_set_width_pixels(CC_SHAPE(rrect), 2.0); + cc_rounded_rectangle_set_radius(CC_ROUNDED_RECTANGLE(rrect), 20.0); + cc_item_append(root, rrect); + + text = cc_text_new(_("Drag the buttons to\nadjust the gradient")); + cc_text_set_anchor_type(CC_TEXT(text), GTK_ANCHOR_SOUTH); + brush = cc_linear_gradient_new(0.5, 0.0, 0.5, 1.0); + cc_gradient_add_stop(CC_GRADIENT(brush), 0.0, cc_color_new_rgb(1.0, 1.0, 1.0)); + cc_gradient_add_stop(CC_GRADIENT(brush), 1.0, cc_color_new_rgb(0.8, 0.8, 0.8)); + cc_shape_set_brush_content(CC_SHAPE(text), brush); + cc_item_append(root, text); + + rect.x1 = 0.5; + rect.y1 = 0.0; + rect.x2 = 0.5; + rect.y2 = 1.0; + + brush = cc_radial_gradient_new(0.5, 0.5, 0.5); + cc_gradient_add_stop(CC_GRADIENT(brush), 0.0, cc_color_new_rgb(0.68, 0.50, 0.66)); + cc_gradient_add_stop(CC_GRADIENT(brush), 1.0, cc_color_new_rgb(0.36, 0.21, 0.40)); + brush2 = cc_brush_color_new(cc_color_new_rgb(0.0, 0.0, 0.0)); + knobs[0] = cc_circle_new(); + cc_circle_set_radius(CC_CIRCLE(knobs[0]), 5.0); + cc_shape_set_brush_content(CC_SHAPE(knobs[0]), brush); + cc_shape_set_brush_border(CC_SHAPE(knobs[0]), brush2); + g_signal_connect(knobs[0], "button-press-event", + G_CALLBACK(knob_button_press_event), NULL); + g_signal_connect(knobs[0], "button-release-event", + G_CALLBACK(knob_button_release_event), NULL); + g_signal_connect(knobs[0], "motion-notify-event", + G_CALLBACK(knob_motion_notify_event), NULL); + cc_item_append(root, knobs[0]); + + knobs[2] = cc_circle_new(); + cc_circle_set_radius(CC_CIRCLE(knobs[2]), 5.0); + cc_shape_set_brush_content(CC_SHAPE(knobs[2]), brush); + cc_shape_set_brush_border(CC_SHAPE(knobs[2]), brush2); + g_signal_connect(knobs[2], "button-press-event", + G_CALLBACK(knob_button_press_event), NULL); + g_signal_connect(knobs[2], "button-release-event", + G_CALLBACK(knob_button_release_event), NULL); + g_signal_connect(knobs[2], "motion-notify-event", + G_CALLBACK(knob_motion_notify_event), NULL); + cc_item_append(root, knobs[2]); + + knobs[1] = cc_circle_new(); + cc_circle_set_radius(CC_CIRCLE(knobs[1]), 5.0); + cc_shape_set_brush_content(CC_SHAPE(knobs[1]), brush); + cc_shape_set_brush_border(CC_SHAPE(knobs[1]), brush2); + g_signal_connect(knobs[1], "button-press-event", + G_CALLBACK(knob_button_press_event), NULL); + g_signal_connect(knobs[1], "button-release-event", + G_CALLBACK(knob_button_release_event), NULL); + g_signal_connect(knobs[1], "motion-notify-event", + G_CALLBACK(knob_motion_notify_event), NULL); + cc_item_append(root, knobs[1]); + + widget = cc_view_widget_new_root(root); + g_signal_connect_after(widget, "size-allocate", + G_CALLBACK(view_size_allocate), NULL); + return demo_page_new(widget, _("Gradient Editor")); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties.c /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties.c 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties.c 2007-04-20 09:54:01.000000000 +0100 @@ -41,9 +41,11 @@ } GtkWidget* -herzi_properties_add(HerziProperties* self, gchar const* label) { - HerziPropertiesGroup* retval = herzi_properties_group_new(label); - self->groups = g_list_append(self->groups, retval); +herzi_properties_add(GtkWidget * self, + gchar const* label) +{ + GtkWidget* retval = herzi_properties_group_new(label); + HERZI_PROPERTIES(self)->groups = g_list_append(HERZI_PROPERTIES(self)->groups, retval); gtk_box_pack_start(GTK_BOX(self), GTK_WIDGET(retval), FALSE, FALSE, 0); return GTK_WIDGET(retval); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties-group.c /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties-group.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties-group.c 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties-group.c 2007-04-20 09:44:43.000000000 +0100 @@ -44,13 +44,17 @@ GtkHBoxClass base_class; }; -HerziPropertiesGroup* -herzi_properties_group_new(gchar const* label) { +GtkWidget* +herzi_properties_group_new(gchar const* label) +{ return g_object_new(HERZI_TYPE_PROPERTIES_GROUP, "label", label, NULL); } void -herzi_properties_group_add(HerziPropertiesGroup* self, gchar const* label, GtkWidget* widget) { +herzi_properties_group_add(GtkWidget * self, + gchar const* label, + GtkWidget * widget) +{ GtkWidget* label_w; GtkWidget* box; @@ -62,13 +66,13 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label_w), widget); gtk_misc_set_alignment(GTK_MISC(label_w), 0.0, 0.5); - gtk_size_group_add_widget(self->groups[0], label_w); + gtk_size_group_add_widget(HERZI_PROPERTIES_GROUP(self)->groups[0], label_w); gtk_box_pack_start_defaults(GTK_BOX(box), label_w); - gtk_size_group_add_widget(self->groups[1], widget); + gtk_size_group_add_widget(HERZI_PROPERTIES_GROUP(self)->groups[1], widget); gtk_box_pack_start(GTK_BOX(box), widget, FALSE, FALSE, 0); - gtk_box_pack_start(self->intern, box, FALSE, FALSE, 0); + gtk_box_pack_start(HERZI_PROPERTIES_GROUP(self)->intern, box, FALSE, FALSE, 0); } /* GType stuff */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties-group.h /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties-group.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties-group.h 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties-group.h 2007-04-20 09:44:43.000000000 +0100 @@ -40,10 +40,10 @@ GType herzi_properties_group_get_type(void); -HerziPropertiesGroup* herzi_properties_group_new(gchar const * label); -void herzi_properties_group_add(HerziPropertiesGroup* self, - gchar const * label, - GtkWidget * widget); +GtkWidget* herzi_properties_group_new(gchar const* label); +void herzi_properties_group_add(GtkWidget * self, + gchar const* label, + GtkWidget * widget); G_END_DECLS diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties.h /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/herzi-properties.h 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/herzi-properties.h 2007-04-20 09:44:43.000000000 +0100 @@ -47,8 +47,8 @@ GType herzi_properties_get_type(void); GtkWidget* herzi_properties_new(void); -GtkWidget* herzi_properties_add(HerziProperties* self, - gchar const * label); +GtkWidget* herzi_properties_add(GtkWidget * self, + gchar const* label); G_END_DECLS diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/layers.c /tmp/irThAZDHWn/libccc-0.0.5/demo/layers.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/layers.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/layers.c 2007-05-05 16:10:02.000000000 +0100 @@ -0,0 +1,137 @@ +/* This file is part of ccc + * + * AUTHORS + * Canek Pelaez + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "main.h" + +#include +#include +#include +#include + +#include + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +#define RECT_RADIUS 3 + +CcItem *layer_demo_root; + +static void +raise_to_top (GtkWidget *button, CcItem* circle) +{ + cc_item_raise_to_top(circle, layer_demo_root); +} + +static void +raise (GtkWidget *button, CcItem* circle) +{ + cc_item_raise(circle, layer_demo_root); +} + +static void +lower (GtkWidget *button, CcItem* circle) +{ + cc_item_lower(circle, layer_demo_root); +} + +static void +lower_to_bottom (GtkWidget *button, CcItem* circle) +{ + cc_item_lower_to_bottom(circle, layer_demo_root); +} + +DemoPage* +layers_demo(void) { + CcItem* root = cc_item_new(); + GtkWidget* view = cc_view_widget_new_root(root); + + CcColor* red_color = cc_color_new_rgba(0.9, 0.9, 0.0, 0.5); + CcColor* green_color = cc_color_new_rgba(0.0, 0.9, 0.9, 0.5); + CcColor* blue_color = cc_color_new_rgba(0.9, 0.0, 0.9, 0.5); + CcColor* gray_color = cc_color_new_rgb(0.5, 0.5, 0.5); + CcColor* black_color = cc_color_new_rgb(0.0, 0.0, 0.0); + CcBrush* black_brush = cc_brush_color_new(black_color); + + GtkWidget* swin = gtk_scrolled_window_new(NULL, NULL); + DemoPage* retval = demo_page_new(gtk_vbox_new(FALSE, 2), _("Layers")); + + gtk_container_set_border_width(GTK_CONTAINER(retval->widget), 6); + + gtk_box_pack_start_defaults(GTK_BOX(retval->widget), swin); + gtk_container_add(GTK_CONTAINER(swin), view); + + CcItem* circle = cc_circle_new(); + CC_ITEM_SET_FLAGS(circle, CC_GRID_ALIGNED); + cc_circle_set_anchor(CC_CIRCLE(circle), 275, 300); + cc_circle_set_radius(CC_CIRCLE(circle), 100); + cc_shape_set_brush_border(CC_SHAPE(circle), black_brush); + cc_shape_set_brush_content(CC_SHAPE(circle), cc_brush_color_new(gray_color)); + cc_item_append(root, circle); + + CcItem* rect = cc_rounded_rectangle_new(); + CC_ITEM_SET_FLAGS(rect, CC_GRID_ALIGNED); + cc_rounded_rectangle_set_radius(CC_ROUNDED_RECTANGLE(rect), RECT_RADIUS); + cc_rectangle_set_position(CC_RECTANGLE(rect), 200, 200, 300, 175); + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgb(0.9, 0.9, 0.0))); + cc_shape_set_brush_content(CC_SHAPE(rect), cc_brush_color_new(red_color)); + cc_item_append(root, rect); + + rect = cc_rounded_rectangle_new(); + CC_ITEM_SET_FLAGS(rect, CC_GRID_ALIGNED); + cc_rounded_rectangle_set_radius(CC_ROUNDED_RECTANGLE(rect), RECT_RADIUS); + cc_rectangle_set_position(CC_RECTANGLE(rect), 220, 180, 300, 175); + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgb(0.0, 0.9, 0.9))); + cc_shape_set_brush_content(CC_SHAPE(rect), cc_brush_color_new(green_color)); + cc_item_append(root, rect); + + rect = cc_rounded_rectangle_new(); + CC_ITEM_SET_FLAGS(rect, CC_GRID_ALIGNED); + cc_rounded_rectangle_set_radius(CC_ROUNDED_RECTANGLE(rect), RECT_RADIUS); + cc_rectangle_set_position(CC_RECTANGLE(rect), 240, 160, 300, 175); + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgb(0.9, 0.0, 0.9))); + cc_shape_set_brush_content(CC_SHAPE(rect), cc_brush_color_new(blue_color)); + cc_item_append(root, rect); + + GtkWidget* hbox = gtk_hbox_new(FALSE, 4); + GtkWidget* button = gtk_button_new_with_label("Raise circle to top"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(raise_to_top), circle); + gtk_box_pack_start_defaults(GTK_BOX(hbox), button); + button = gtk_button_new_with_label("Raise circle"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(raise), circle); + gtk_box_pack_start_defaults(GTK_BOX(hbox), button); + button = gtk_button_new_with_label("Lower circle"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(lower), circle); + gtk_box_pack_start_defaults(GTK_BOX(hbox), button); + button = gtk_button_new_with_label("Lower circle to bottom"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(lower_to_bottom), circle); + gtk_box_pack_start_defaults(GTK_BOX(hbox), button); + + gtk_box_pack_start(GTK_BOX(retval->widget), hbox, FALSE, FALSE, 0); + + layer_demo_root = root; + + return retval; +} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/line.c /tmp/irThAZDHWn/libccc-0.0.5/demo/line.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/line.c 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/line.c 2007-04-24 15:19:34.000000000 +0100 @@ -1,9 +1,9 @@ -/* this file is part of libccc, criawips' cairo-based canvas +/* this file is part of libccc * * AUTHORS * Sven Herzberg * - * Copyright (C) 2005 Sven Herzberg + * Copyright (C) 2005,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -21,14 +21,21 @@ * USA */ -#include "line.h" +#include "main.h" #include #include +#ifdef HAVE_CONFIG_H +# include +#endif +#include + static void update_bounds(CcItem* line, CcView* view, CcDRect* bounds, CcRectangle* rect) { - g_return_if_fail(bounds); + if(!bounds) { + return; + } cc_rectangle_set_position(rect, bounds->x1, bounds->y1, @@ -38,18 +45,16 @@ DemoPage* line(void) { - DemoPage* page = g_new0(DemoPage, 1); CcItem* item = cc_item_new(); CcItem* line = cc_line_new(); CcItem* rect = cc_rectangle_new(); - page->title = "Lines"; + DemoPage* page = demo_page_new(cc_view_widget_new_root(item), _("Lines")); g_signal_connect(line, "all-bounds-changed", G_CALLBACK(update_bounds), rect); cc_line_move(CC_LINE(line), 5.0, 5.0); cc_line_line(CC_LINE(line), 95.0, 95.0); cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgb(1.0, 0.0, 0.0))); cc_shape_set_brush_border(CC_SHAPE(line), cc_brush_color_new(cc_color_new_rgb(0.0, 0.0, 1.0))); - page->widget = cc_view_widget_new_root(item); cc_item_append(item, line); cc_item_append(item, rect); return page; diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/line.h /tmp/irThAZDHWn/libccc-0.0.5/demo/line.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/line.h 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/line.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -/* this file is part of libccc, criawips' cairo-based canvas - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2005 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef LINE_H -#define LINE_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* line(void); - -G_END_DECLS - -#endif /* LINE_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/main.c /tmp/irThAZDHWn/libccc-0.0.5/demo/main.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/main.c 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/main.c 2007-05-05 15:00:47.000000000 +0100 @@ -1,9 +1,9 @@ -/* this file is part of libccc, criawips' cairo-based canvas +/* this file is part of libccc * * AUTHORS * Sven Herzberg * - * Copyright (C) 2005,2006 Sven Herzberg + * Copyright (C) 2005,2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -23,15 +23,8 @@ #include -#include "credits.h" -#include "crossing.h" #include "demo-window.h" -#include "fifteen.h" -#include "line.h" -#include "planets.h" -#include "text-demo.h" -#include "tree-integration.h" -#include "zoom-and-scroll.h" +#include "main.h" int main(int argc, char* argv[]) { @@ -42,15 +35,25 @@ g_signal_connect(mainwin, "delete-event", G_CALLBACK(gtk_main_quit), NULL); - //demo_window_add(DEMO_WINDOW(mainwin), credits()); demo_window_add(DEMO_WINDOW(mainwin), crossing()); demo_window_add(DEMO_WINDOW(mainwin), fifteen()); + demo_window_add(DEMO_WINDOW(mainwin), flowers()); demo_window_add(DEMO_WINDOW(mainwin), line()); - demo_window_add(DEMO_WINDOW(mainwin), planet_page()); + demo_window_add(DEMO_WINDOW(mainwin), pixbuf_demo()); demo_window_add(DEMO_WINDOW(mainwin), text_demo()); - //demo_window_add(DEMO_WINDOW(mainwin), tree_integration()); + demo_window_add(DEMO_WINDOW(mainwin), tree_integration()); demo_window_add(DEMO_WINDOW(mainwin), zoom_and_scroll()); - + demo_window_add(DEMO_WINDOW(mainwin), camera_demo()); + demo_window_add(DEMO_WINDOW(mainwin), gradient_demo()); + demo_window_add(DEMO_WINDOW(mainwin), animation_demo()); + demo_window_add(DEMO_WINDOW(mainwin), layers_demo()); + // FIXME: add some code that raises semi-transparent shapes (make the number of shapes configurable) + // FIXME: take the code into a prof folder and write some profile-test +#ifdef BUILD_UNFINISHED + demo_window_add(DEMO_WINDOW(mainwin), credits()); + demo_window_add(DEMO_WINDOW(mainwin), planet_page()); + demo_window_add(DEMO_WINDOW(mainwin), printer_demo()); +#endif gtk_widget_show_all(mainwin); gtk_main(); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/main.h /tmp/irThAZDHWn/libccc-0.0.5/demo/main.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/main.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/main.h 2007-05-05 14:45:44.000000000 +0100 @@ -0,0 +1,48 @@ +/* This file is part of CCC, a cairo-based canvas + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef MAIN_H +#define MAIN_H + +#include "demo-page.h" + +DemoPage* animation_demo (void); +DemoPage* camera_demo (void); +DemoPage* credits (void); +DemoPage* crossing (void); +DemoPage* fifteen (void); +DemoPage* flowers (void); +DemoPage* gradient_demo (void); +DemoPage* layers_demo (void); +DemoPage* line (void); +DemoPage* pixbuf_demo (void); +DemoPage* planet_page (void); +DemoPage* printer_demo (void); +DemoPage* simple_item (void); +DemoPage* text_demo (void); +DemoPage* tree_integration(void); +DemoPage* zoom_and_scroll (void); + +#endif /* !MAIN_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/demo/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/Makefile.am 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/Makefile.am 2007-05-05 14:59:46.000000000 +0100 @@ -2,22 +2,24 @@ noinst_PROGRAMS=ccc-demo ccc_demo_SOURCES=\ + animation.c \ + camera.c \ credits.c \ - credits.h \ crossing.c \ - crossing.h \ demo-canvas.c \ demo-canvas.h \ demo-page.c \ demo-page.h \ + demo-polygon.c \ + demo-polygon.h \ demo-window.c \ demo-window.h \ fifteen.c \ - fifteen.h \ fifteen-grid.c \ fifteen-grid.h \ fifteen-item.c \ fifteen-item.h \ + gradient.c \ herzi-enum-combo.c \ herzi-enum-combo.h \ herzi-enum-model.c \ @@ -26,25 +28,27 @@ herzi-properties.h \ herzi-properties-group.c \ herzi-properties-group.h \ + layers.c \ line.c \ - line.h \ main.c \ + main.h \ + pixbuf-demo.c \ + printer-demo.c \ planets.c \ - planets.h \ + simple-item.c \ text-demo.c \ - text-demo.h \ tree-integration.c \ - tree-integration.h \ zoom-and-scroll.c \ - zoom-and-scroll.h \ $(NULL) ccc_demo_LDADD=\ $(CCC_LIBS) \ + $(DEMO_LIBS) \ $(top_builddir)/ccc/libccc-0.1.la \ $(NULL) AM_CPPFLAGS=\ $(CCC_CFLAGS) \ + $(DEMO_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/ccc \ $(NULL) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/demo/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/Makefile.in 2006-09-03 19:57:10.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/Makefile.in 2007-05-05 23:17:40.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +34,58 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +noinst_PROGRAMS = ccc-demo$(EXEEXT) +subdir = demo +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +PROGRAMS = $(noinst_PROGRAMS) +am__objects_1 = +am_ccc_demo_OBJECTS = animation.$(OBJEXT) camera.$(OBJEXT) \ + credits.$(OBJEXT) crossing.$(OBJEXT) demo-canvas.$(OBJEXT) \ + demo-page.$(OBJEXT) demo-polygon.$(OBJEXT) \ + demo-window.$(OBJEXT) fifteen.$(OBJEXT) fifteen-grid.$(OBJEXT) \ + fifteen-item.$(OBJEXT) gradient.$(OBJEXT) \ + herzi-enum-combo.$(OBJEXT) herzi-enum-model.$(OBJEXT) \ + herzi-properties.$(OBJEXT) herzi-properties-group.$(OBJEXT) \ + layers.$(OBJEXT) line.$(OBJEXT) main.$(OBJEXT) \ + pixbuf-demo.$(OBJEXT) printer-demo.$(OBJEXT) planets.$(OBJEXT) \ + simple-item.$(OBJEXT) text-demo.$(OBJEXT) \ + tree-integration.$(OBJEXT) zoom-and-scroll.$(OBJEXT) \ + $(am__objects_1) +ccc_demo_OBJECTS = $(am_ccc_demo_OBJECTS) +am__DEPENDENCIES_1 = +ccc_demo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/ccc/libccc-0.1.la $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(ccc_demo_SOURCES) +DIST_SOURCES = $(ccc_demo_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -53,6 +103,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -62,7 +114,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -75,6 +131,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -83,6 +140,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -130,7 +189,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,6 +229,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -184,6 +247,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,6 +274,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -223,25 +289,25 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ NULL = -noinst_PROGRAMS = ccc-demo - ccc_demo_SOURCES = \ + animation.c \ + camera.c \ credits.c \ - credits.h \ crossing.c \ - crossing.h \ demo-canvas.c \ demo-canvas.h \ demo-page.c \ demo-page.h \ + demo-polygon.c \ + demo-polygon.h \ demo-window.c \ demo-window.h \ fifteen.c \ - fifteen.h \ fifteen-grid.c \ fifteen-grid.h \ fifteen-item.c \ fifteen-item.h \ + gradient.c \ herzi-enum-combo.c \ herzi-enum-combo.h \ herzi-enum-model.c \ @@ -250,88 +316,65 @@ herzi-properties.h \ herzi-properties-group.c \ herzi-properties-group.h \ + layers.c \ line.c \ - line.h \ main.c \ + main.h \ + pixbuf-demo.c \ + printer-demo.c \ planets.c \ - planets.h \ + simple-item.c \ text-demo.c \ - text-demo.h \ tree-integration.c \ - tree-integration.h \ zoom-and-scroll.c \ - zoom-and-scroll.h \ $(NULL) ccc_demo_LDADD = \ $(CCC_LIBS) \ + $(DEMO_LIBS) \ $(top_builddir)/ccc/libccc-0.1.la \ $(NULL) - AM_CPPFLAGS = \ $(CCC_CFLAGS) \ + $(DEMO_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/ccc \ $(NULL) -subdir = demo -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -noinst_PROGRAMS = ccc-demo$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - -am__objects_1 = -am_ccc_demo_OBJECTS = credits.$(OBJEXT) crossing.$(OBJEXT) \ - demo-canvas.$(OBJEXT) demo-page.$(OBJEXT) demo-window.$(OBJEXT) \ - fifteen.$(OBJEXT) fifteen-grid.$(OBJEXT) fifteen-item.$(OBJEXT) \ - herzi-enum-combo.$(OBJEXT) herzi-enum-model.$(OBJEXT) \ - herzi-properties.$(OBJEXT) herzi-properties-group.$(OBJEXT) \ - line.$(OBJEXT) main.$(OBJEXT) planets.$(OBJEXT) \ - text-demo.$(OBJEXT) tree-integration.$(OBJEXT) \ - zoom-and-scroll.$(OBJEXT) $(am__objects_1) -ccc_demo_OBJECTS = $(am_ccc_demo_OBJECTS) -ccc_demo_DEPENDENCIES = $(top_builddir)/ccc/libccc-0.1.la -ccc_demo_LDFLAGS = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/credits.Po ./$(DEPDIR)/crossing.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/demo-canvas.Po ./$(DEPDIR)/demo-page.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/demo-window.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fifteen-grid.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fifteen-item.Po ./$(DEPDIR)/fifteen.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/herzi-enum-combo.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/herzi-enum-model.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/herzi-properties-group.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/herzi-properties.Po ./$(DEPDIR)/line.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/planets.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/text-demo.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tree-integration.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/zoom-and-scroll.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(ccc_demo_SOURCES) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(ccc_demo_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demo/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu demo/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ @@ -344,62 +387,58 @@ $(LINK) $(ccc_demo_LDFLAGS) $(ccc_demo_OBJECTS) $(ccc_demo_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animation.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/credits.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crossing.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo-canvas.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo-page.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo-polygon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifteen-grid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifteen-item.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fifteen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/herzi-enum-combo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/herzi-enum-model.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/herzi-properties-group.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/herzi-properties.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-demo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/planets.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer-demo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple-item.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-demo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree-integration.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom-and-scroll.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -411,14 +450,6 @@ -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -427,6 +458,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -438,10 +470,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -464,10 +497,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -481,7 +510,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -499,7 +528,6 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) - installdirs: install: install-am install-exec: install-exec-am @@ -520,7 +548,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -540,6 +568,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -577,13 +607,14 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/pixbuf-demo.c /tmp/irThAZDHWn/libccc-0.0.5/demo/pixbuf-demo.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/pixbuf-demo.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/pixbuf-demo.c 2007-04-20 09:54:01.000000000 +0100 @@ -0,0 +1,193 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "main.h" + +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ + +#include +#include +#include + +#include "herzi-enum-combo.h" +#include "herzi-properties.h" + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +static void +canvas_center_view_toggled(GtkToggleButton* toggle, CcViewWidget* view) { + gboolean state = gtk_toggle_button_get_active(toggle); + cc_view_widget_set_center_view(view, state); + + gtk_button_set_label(GTK_BUTTON(toggle), state ? "Centered" : "Not Centered"); +} + +static void +canvas_zoom_changed(GtkSpinButton* spin, CcView* view) { + cc_view_set_zoom(view, gtk_spin_button_get_value(spin)); +} + +static void +pixbuf_position_x_changed(GtkSpinButton* spin, CcPixbuf* pixbuf) { + cc_pixbuf_set_position_x(pixbuf, gtk_spin_button_get_value(spin)); +} + +static void +pixbuf_position_y_changed(GtkSpinButton* spin, CcPixbuf* pixbuf) { + cc_pixbuf_set_position_y(pixbuf, gtk_spin_button_get_value(spin)); +} + +static void +pixbuf_rotation_changed(GtkSpinButton* spin, CcPixbuf* pbuf) { + gdouble rotation = G_PI * gtk_spin_button_get_value(spin); + cc_pixbuf_set_rotation(pbuf, rotation); +} + +static void +update_bounds(CcItem* text, CcView* view, CcDRect* bounds, CcRectangle* rectangle) { + if(!bounds) { + return; + } + + cc_rectangle_set_position(rectangle, + bounds->x1, bounds->y1, + bounds->x2 - bounds->x1, + bounds->y2 - bounds->y1); +} + +static CcItem* root = NULL; +static CcItem* arrow = NULL; + +DemoPage* +pixbuf_demo(void) { + GtkWidget* canvas, + * notebook, + * widget, + * control, + * props, + * prop_group; + CcItem * pitem, + * rect; + GdkPixbuf* pixbuf; + DemoPage * retval = demo_page_new(gtk_vbox_new(FALSE, 6), _("Pixbuf")); + + root = cc_item_new(); + pitem = cc_pixbuf_new(); + //cc_pixbuf_set_position(CC_PIXBUF(pitem), 10, 10, 128, 128); + pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gdk_screen_get_default()), + "folder", 128, + 0, NULL); + cc_pixbuf_set_pixbuf(CC_PIXBUF(pitem), pixbuf); + g_object_unref(pixbuf); + cc_item_append(root, pitem); + rect = cc_rectangle_new(); + cc_item_set_grid_aligned(rect, TRUE); + cc_item_append(root, rect); + arrow = cc_line_new(); + cc_item_set_grid_aligned(arrow, TRUE); + cc_line_line(CC_LINE(arrow), 5.0, 0.0); + cc_line_line(CC_LINE(arrow), 0.0, 5.0); + cc_line_line(CC_LINE(arrow), 0.0, 0.0); + cc_line_line(CC_LINE(arrow), 5.0, 0.0); + cc_item_append(root, arrow); + cc_shape_set_brush_border(CC_SHAPE(arrow), cc_brush_color_new(cc_color_new_rgba(0.0, 0.0, 1.0, 0.5))); + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgba(1.0, 0.0, 0.0, 0.5))); + + g_signal_connect(pitem, "all-bounds-changed", + G_CALLBACK(update_bounds), rect); + + canvas = cc_view_widget_new_root(root); + GTK_WIDGET_SET_FLAGS(canvas, GTK_CAN_FOCUS); + gtk_box_pack_start_defaults(GTK_BOX(retval->widget), canvas); + + notebook = gtk_notebook_new(); + gtk_box_pack_start(GTK_BOX(retval->widget), notebook, FALSE, FALSE, 0); + + props = herzi_properties_new(); + prop_group = herzi_properties_add(props, "Canvas View"); + + // Center View + widget = gtk_toggle_button_new(); + gtk_button_set_use_underline(GTK_BUTTON(widget), TRUE); + g_signal_connect(widget, "toggled", + G_CALLBACK(canvas_center_view_toggled), canvas); + canvas_center_view_toggled(GTK_TOGGLE_BUTTON(widget), CC_VIEW_WIDGET(canvas)); + herzi_properties_group_add(prop_group, "_Center View", widget); + + // Zoom + widget = gtk_spin_button_new_with_range(G_MINDOUBLE, G_MAXDOUBLE, 0.01); + g_signal_connect(widget, "value-changed", + G_CALLBACK(canvas_zoom_changed), canvas); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), cc_view_get_zoom(CC_VIEW(canvas))); + herzi_properties_group_add(prop_group, "_Zoom", widget); + + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + props, + gtk_label_new("Canvas View")); + + props = herzi_properties_new(); + prop_group = herzi_properties_add(props, "Pixbuf"); + + // Position + widget = gtk_spin_button_new_with_range(-G_MAXDOUBLE, G_MAXDOUBLE, 1.0); + g_signal_connect(widget, "value-changed", + G_CALLBACK(pixbuf_position_x_changed), pitem); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), 0.0); + herzi_properties_group_add(prop_group, "_Horizontal Position", widget); + widget = gtk_spin_button_new_with_range(-G_MAXDOUBLE, G_MAXDOUBLE, 1.0); + g_signal_connect(widget, "value-changed", + G_CALLBACK(pixbuf_position_y_changed), pitem); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), 0.0); + herzi_properties_group_add(prop_group, "_Vertical Position", widget); + + // Rotation + widget = gtk_hbox_new(FALSE, 0); + control = gtk_spin_button_new_with_range(-1.0, 1.0, 0.002); + g_signal_connect(control, "value-changed", + G_CALLBACK(pixbuf_rotation_changed), pitem); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(control), 0.0); + gtk_box_pack_start(GTK_BOX(widget), control, FALSE, FALSE, 0); + control = gtk_label_new("π"); + gtk_box_pack_start(GTK_BOX(widget), control, FALSE, FALSE, 0); + herzi_properties_group_add(prop_group, "_Rotation", widget); +#if 0 + // Text + widget = gtk_entry_new(); + g_signal_connect(widget, "notify::text", + G_CALLBACK(text_text_changed), text); + gtk_entry_set_text(GTK_ENTRY(widget), PACKAGE " " VERSION); + g_signal_connect(text, "notify::text", + G_CALLBACK(update_entry_from_layout), widget); + herzi_properties_group_add(prop_group, "_Text", widget); +#endif + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + props, + gtk_label_new("Pixbuf")); + return retval; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/planets.c /tmp/irThAZDHWn/libccc-0.0.5/demo/planets.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/planets.c 2006-08-11 19:39:53.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/planets.c 2007-04-28 20:35:43.000000000 +0100 @@ -3,7 +3,7 @@ * AUTHORS * Sven Herzberg * - * Copyright (C) 2006 Sven Herzberg + * Copyright (C) 2006,2007 Sven Herzberg * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License as @@ -21,10 +21,19 @@ * USA */ -#include "planets.h" +#include "main.h" #include +typedef struct Planet { + gchar const* name; + gchar const* symbol; + gdouble distance; +} Planet; + +extern Planet planets[]; +extern guint n_planets; + // The numbers are taken from the german wikipedia pages about these planets Planet planets[] = { {"Merkur", "☿", 0.3871}, diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/planets.h /tmp/irThAZDHWn/libccc-0.0.5/demo/planets.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/planets.h 2006-08-11 19:39:53.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/planets.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -/* This file is part of ... - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2006 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef PLANETS_H -#define PLANETS_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* planet_page(void); - -typedef struct Planet { - gchar const* name; - gchar const* symbol; - gdouble distance; -} Planet; - -extern Planet planets[]; -extern guint n_planets; - -G_END_DECLS - -#endif /* !PLANETS_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/printer-demo.c /tmp/irThAZDHWn/libccc-0.0.5/demo/printer-demo.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/printer-demo.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/printer-demo.c 2007-05-05 14:45:10.000000000 +0100 @@ -0,0 +1,70 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "main.h" + +#ifdef HAVE_CONFIG_H +# include +#endif /* HAVE_CONFIG_H */ + +#include +#include +#include +#include + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +static void +print_canvas(GtkWidget* button) +{ + GtkWidget* dialog = gtk_print_unix_dialog_new(_("Printing the demo canvas"), + GTK_WINDOW(gtk_widget_get_toplevel(button))); + switch(gtk_dialog_run(GTK_DIALOG(dialog))) { + case GTK_RESPONSE_OK: + //gtk_print_unix_dialog_get_selected_printer() + //gtk_print_job_new() + //gtk_print_job_get_surface() + break; + case GTK_RESPONSE_APPLY: + break; + case GTK_RESPONSE_CANCEL: + break; + } + gtk_widget_destroy(dialog); +} + +DemoPage* +printer_demo(void) { + DemoPage * retval = g_new0(DemoPage, 1); + + retval->title = _("Printing"); + retval->widget = gtk_button_new_from_stock(GTK_STOCK_PRINT); + g_signal_connect(retval->widget, "clicked", + G_CALLBACK(print_canvas), NULL); + + return retval; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/simple-item.c /tmp/irThAZDHWn/libccc-0.0.5/demo/simple-item.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/simple-item.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/simple-item.c 2007-04-28 20:35:43.000000000 +0100 @@ -0,0 +1,124 @@ +/* This file is part of libccc + * + * AUTHORS + * Mirco "MacSlow" Müller + * Sven Herzberg + * + * Copyright (C) 2007 Mirco "MacSlow" Müller + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "main.h" + +#include +#include +#include +#include + +#define TOP 0 +#define LEFT 0 +#define WIDTH 200 +#define HEIGHT 200 + +static void +paint (CcSimpleItem* pItem, + CcView* pView, + cairo_t* pContext) +{ + unsigned long ulMilliSeconds; + double fOffsetX = 0.0f; + double fOffsetY = 0.0f; + double fLength = 1.0f / 25.0f; + double fY; + gint i; + static GTimer* pTimer = NULL; + + if (!pTimer) + { + pTimer = g_timer_new (); + g_signal_connect_swapped (GTK_WIDGET (pView), + "destroy", + G_CALLBACK (g_timer_destroy), + (gpointer) pTimer); + } + + cc_view_world_to_window (pView, &fOffsetX, &fOffsetY); + cairo_translate (pContext, fOffsetX, fOffsetY); + + g_timer_elapsed (pTimer, &ulMilliSeconds); + ulMilliSeconds /= 1000; + + cairo_save (pContext); + cairo_scale (pContext, WIDTH, HEIGHT); + cairo_set_line_cap (pContext, CAIRO_LINE_CAP_ROUND); + cairo_set_operator (pContext, CAIRO_OPERATOR_OVER); + cairo_set_line_width (pContext, fLength); + for (i = 0; i < 60; i++) + { + cairo_save (pContext); + cairo_translate (pContext, 0.5f, 0.5f); + cairo_rotate (pContext, + G_PI / 180.0f * + (ulMilliSeconds + 10.0f * i) * 0.36f); + fY = 0.33f + 0.0825f * + sinf ((ulMilliSeconds + 10.0f * i) / 1000 * 10 * G_PI); + cairo_translate (pContext, 0.0f, fY); + cairo_rotate (pContext, G_PI / 180.0f * 6.0f * i); + cairo_set_source_rgba (pContext, 0.25f, 0.5f, 1.0f, i * 0.01f); + cairo_move_to (pContext, -fLength, 0.0f); + cairo_line_to (pContext, fLength, 0.0f); + cairo_stroke (pContext); + cairo_restore (pContext); + } + cairo_restore (pContext); + + cc_item_dirty (pItem, pView, *cc_item_get_all_bounds (pItem, pView)); +} + +static void +recalc_bbox (CcSimpleItem* pItem, + CcView const* pView, + gpointer data) +{ + CcDRect drect = {TOP, LEFT, TOP + WIDTH, LEFT + HEIGHT}; + cc_hash_map_insert (CC_ITEM (pItem)->bounds, + (CcView*)pView, + cc_d_rect_copy (&drect)); + cc_item_bounds_changed (pItem, pView); +} + +DemoPage* +flowers (void) +{ + CcSimpleItem* pFlower = cc_simple_item_new (); + + g_signal_connect (pFlower, + "render", + G_CALLBACK (paint), + NULL); + + g_signal_connect (pFlower, + "update-bounds", + G_CALLBACK (recalc_bbox), + NULL); + + return demo_page_new (cc_view_widget_new_root (pFlower), _("Simple Item")); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/text-demo.c /tmp/irThAZDHWn/libccc-0.0.5/demo/text-demo.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/text-demo.c 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/text-demo.c 2007-05-05 16:10:02.000000000 +0100 @@ -21,7 +21,7 @@ * USA */ -#include "text-demo.h" +#include "main.h" #ifdef HAVE_CONFIG_H # include @@ -34,6 +34,8 @@ #include "herzi-enum-combo.h" #include "herzi-properties.h" +#include + static void canvas_center_view_toggled(GtkToggleButton* toggle, CcViewWidget* view) { gboolean state = gtk_toggle_button_get_active(toggle); @@ -79,9 +81,9 @@ } cc_rectangle_set_position(rectangle, - bounds->x1, bounds->y1, - bounds->x2 - bounds->x1, - bounds->y2 - bounds->y1); + bounds->x1 - 1.0, bounds->y1 - 1.0, + bounds->x2 - bounds->x1 + 2.0, + bounds->y2 - bounds->y1 + 2.0); } static void @@ -98,12 +100,29 @@ g_object_freeze_notify(G_OBJECT(entry)); } -CcItem* root = NULL; -CcItem* arrow = NULL; +static void +text_focus_in(CcText * text, + CcView * view, + GtkDirectionType dir, + CcRectangle * rect) +{ + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgba(0.0, 0.0, 0.0, 1.0))); +} + +static void +text_focus_out(CcText * text, + CcView * view, + GtkDirectionType dir, + CcRectangle * rect) +{ + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgba(0.5, 0.5, 0.5, 0.5))); +} + +static CcItem* root = NULL; +static CcItem* arrow = NULL; DemoPage* text_demo(void) { - DemoPage * retval = g_new0(DemoPage, 1); GtkWidget* canvas, * notebook, * widget, @@ -111,9 +130,7 @@ * prop_group; CcItem * text, * rect; - - retval->title = "Text Element"; - retval->widget = gtk_vbox_new(FALSE, 6); + DemoPage * retval = demo_page_new(gtk_vbox_new(FALSE, 6), _("Text Element")); root = cc_item_new(); text = cc_text_new(""); @@ -121,6 +138,10 @@ cc_text_set_editable(CC_TEXT(text), TRUE); cc_item_append(root, text); rect = cc_rectangle_new(); + g_signal_connect(text, "focus-enter", + G_CALLBACK(text_focus_in), rect); + g_signal_connect(text, "focus-leave", + G_CALLBACK(text_focus_out), rect); cc_item_set_grid_aligned(rect, TRUE); cc_item_append(root, rect); arrow = cc_line_new(); @@ -130,8 +151,8 @@ cc_line_line(CC_LINE(arrow), 0.0, 0.0); cc_line_line(CC_LINE(arrow), 5.0, 0.0); cc_item_append(root, arrow); + text_focus_out(CC_TEXT(text), NULL, GTK_DIR_TAB_BACKWARD, CC_RECTANGLE(rect)); cc_shape_set_brush_border(CC_SHAPE(arrow), cc_brush_color_new(cc_color_new_rgba(0.0, 0.0, 1.0, 0.5))); - cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgba(1.0, 0.0, 0.0, 0.5))); g_signal_connect(text, "all-bounds-changed", G_CALLBACK(update_bounds), rect); @@ -144,7 +165,7 @@ gtk_box_pack_start(GTK_BOX(retval->widget), notebook, FALSE, FALSE, 0); props = herzi_properties_new(); - prop_group = herzi_properties_add(HERZI_PROPERTIES(props), "Canvas View"); + prop_group = herzi_properties_add(props, "Canvas View"); // Center View widget = gtk_toggle_button_new(); @@ -166,7 +187,7 @@ gtk_label_new("Canvas View")); props = herzi_properties_new(); - prop_group = herzi_properties_add(HERZI_PROPERTIES(props), "Text Element"); + prop_group = herzi_properties_add(props, "Text Element"); // Anchor widget = herzi_enum_combo_new(GTK_TYPE_ANCHOR_TYPE); g_signal_connect(widget, "changed", diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/text-demo.h /tmp/irThAZDHWn/libccc-0.0.5/demo/text-demo.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/text-demo.h 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/text-demo.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -/* This file is part of libccc - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2006 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef TEXT_DEMO_H -#define TEXT_DEMO_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* text_demo(void); - -G_END_DECLS - -#endif /* !TEXT_DEMO_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/tree-integration.c /tmp/irThAZDHWn/libccc-0.0.5/demo/tree-integration.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/tree-integration.c 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/tree-integration.c 2007-04-24 13:32:52.000000000 +0100 @@ -21,11 +21,13 @@ * USA */ -#include "tree-integration.h" +#include "main.h" #include #include +#include "demo-polygon.h" + enum { COL_NUM, COL_TEXT, @@ -36,38 +38,49 @@ DemoPage* tree_integration(void) { + GtkWidget * tree; DemoPage * page = g_object_new(DEMO_TYPE_PAGE, NULL); GtkTreeModel* model; GtkTreeIter iter; guint i; + GtkTargetEntry targets[] = { + {"text/plain", 0, 0} + }; page->title = "Tree Integration"; - page->widget = gtk_tree_view_new(); + page->widget = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(page->widget), GTK_SHADOW_IN); + tree = gtk_tree_view_new(); + gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree), 0, + targets, G_N_ELEMENTS(targets), + GDK_ACTION_COPY); + // FIXME: add drag source at some point + gtk_container_add(GTK_CONTAINER(page->widget), tree); model = GTK_TREE_MODEL(gtk_list_store_new(N_COLUMNS, G_TYPE_INT, G_TYPE_STRING, CC_TYPE_ITEM, CC_TYPE_ITEM)); - for(i = 1; i <= 12; i++) { + for(i = 3; i <= 12; i++) { gchar* text = g_strdup_printf("%d", i); gtk_list_store_append(GTK_LIST_STORE(model), &iter); gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_NUM, i, COL_TEXT, text, - COL_POLYGON, cc_item_new(), // FIXME make this a polygon with i corners - COL_POLYGRAM, cc_item_new(), // FIXME make this a polygram with i corners + COL_POLYGON, demo_polygon_new(i), // FIXME make this a polygon with i corners + COL_POLYGRAM, cc_item_new(), // FIXME make this a polygram with i corners -1); g_free(text); } - gtk_tree_view_set_model(GTK_TREE_VIEW(page->widget), model); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(page->widget), -1, + gtk_tree_view_set_model(GTK_TREE_VIEW(tree), model); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree), -1, "Corners", gtk_cell_renderer_text_new(), "text", COL_TEXT, NULL); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(page->widget), -1, + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree), -1, "Polygon", cc_view_cell_renderer_new(), "root", COL_POLYGON, NULL); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(page->widget), -1, + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree), -1, "Polygram", cc_view_cell_renderer_new(), "root", COL_POLYGRAM, NULL); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/tree-integration.h /tmp/irThAZDHWn/libccc-0.0.5/demo/tree-integration.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/tree-integration.h 2006-06-13 12:02:04.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/tree-integration.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -/* this file is part of libccc, criawips' cairo-based canvas - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2005 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef TREE_INTEGRATION_H -#define TREE_INTEGRATION_H - -#include "demo-page.h" - -DemoPage* tree_integration(void); - -#endif /* !TREE_INTEGARTION_H */ - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/zoom-and-scroll.c /tmp/irThAZDHWn/libccc-0.0.5/demo/zoom-and-scroll.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/zoom-and-scroll.c 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/zoom-and-scroll.c 2007-04-24 15:19:34.000000000 +0100 @@ -21,7 +21,7 @@ * USA */ -#include "zoom-and-scroll.h" +#include "main.h" #include #include @@ -121,6 +121,7 @@ 0,0); widget_one = NULL; widget_one = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget_one), GTK_SHADOW_IN); gtk_table_attach(GTK_TABLE(page->widget), widget_one, 0,2, 4,5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/demo/zoom-and-scroll.h /tmp/irThAZDHWn/libccc-0.0.5/demo/zoom-and-scroll.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/demo/zoom-and-scroll.h 2006-06-13 12:02:05.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/demo/zoom-and-scroll.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* this file is part of libccc, criawips' cairo-based canvas - * - * AUTHORS - * Sven Herzberg - * - * Copyright (C) 2005 Sven Herzberg - * - * This program 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.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#ifndef ZOOM_AND_SCROLL_H -#define ZOOM_AND_SCROLL_H - -#include "demo-page.h" - -G_BEGIN_DECLS - -DemoPage* zoom_and_scroll(void); - -G_END_DECLS - -#endif /* !ZOOM_AND_SCOLL_H */ - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/depcomp /tmp/irThAZDHWn/libccc-0.0.5/depcomp --- /tmp/vgIwXsgmrf/libccc-0.0.3/depcomp 2006-06-29 15:53:25.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/depcomp 2007-04-19 16:00:46.000000000 +0100 @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. + +scriptversion=2005-07-09.11 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # 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 @@ -15,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -262,27 +287,43 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + # With Tru64 cc, shared objects can also be used to make a + # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -426,7 +467,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" @@ -477,3 +519,12 @@ esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/doc/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/Makefile.in 2006-09-03 19:57:13.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/Makefile.in 2007-05-05 23:17:41.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +33,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -53,6 +79,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -62,7 +90,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -75,6 +107,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -83,6 +116,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -130,7 +165,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,6 +205,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -184,6 +223,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,6 +250,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -223,28 +265,38 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = reference -subdir = doc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -263,7 +315,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -275,7 +333,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -283,7 +341,13 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -304,7 +368,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -315,14 +379,6 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -331,19 +387,22 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -353,10 +412,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -379,10 +439,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -396,7 +452,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -411,15 +467,17 @@ || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -429,7 +487,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -449,7 +506,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -467,6 +524,8 @@ dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -501,22 +560,18 @@ uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ - pdf-recursive ps ps-am ps-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-custom-items.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-custom-items.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-custom-items.xml 2006-06-13 12:02:22.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-custom-items.xml 2007-05-04 20:40:50.000000000 +0100 @@ -1,4 +1,4 @@ - + Writing custom canvas items @@ -20,6 +20,8 @@ + + Grid-fitting @@ -73,4 +75,28 @@ You see, it's quite easy to render pixel-aligned. + + + Storing view-related data + + + Sometimes you want to store some data per view. The CcText + implementation eg. uses one PangoLayout per view. Sometimes + it's just necessary and CCC helps you to manage this + view-related data very easily. + + + + The API described here is designed very similar to the implementation + of private object data in GObject. + The only difference is that one item stores multiple data chunks, one + per view. + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-docs.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-docs.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-docs.sgml 2006-06-13 12:02:21.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-docs.sgml 2007-05-05 16:10:02.000000000 +0100 @@ -2,34 +2,52 @@ - - libccc Reference Manual - - - - Working with the Canvas - - This part describes several aspects of the canvas that people will be - confronted with when developing applications with this canvas. - - - - - - - Internals - - - - - - - + + libccc Reference Manual + + + + Working with the Canvas + + This part describes several aspects of the canvas that people will be + confronted with when developing applications with this canvas. + + + + We'll start with some simple examples about creating a display + widget and adding some canvas items. + + + + + If you want to use the flexibility of CCC and create your own + canvas items, the next section will explain how to use the + rapid prototyping API to quickly create your own items. + + + + Large applications will want to have their own set of canvas + items. The fourth part will walk you through the process of + creating your own full-featured canvas items. + + + + + + + + + + API Reference - + Object Hierarchy @@ -40,15 +58,26 @@ + + + - + Canvas Items + + + + + + + + @@ -57,6 +86,20 @@ + + + + + Internals + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-sections.txt /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-sections.txt --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-sections.txt 2006-07-14 17:30:36.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-sections.txt 2007-05-05 14:50:44.000000000 +0100 @@ -1,3 +1,5 @@ +ccc.h +
brush CcBrush @@ -33,17 +35,74 @@
+camera +CcCamera +CcCameraClass +cc_camera_new +cc_camera_new_root +cc_camera_get_root +cc_camera_set_root +CcCamera + +cc_camera_get_type +CC_CAMERA +CC_CAMERA_CLASS +CC_CAMERA_GET_CLASS +CC_IS_CAMERA +CC_IS_CAMERA_CLASS +CC_TYPE_CAMERA +
+ +
+cc-caret +CcCaret +CcCaretClass +cc_caret_new +cc_caret_set_position + +CC_CARET +CC_CARET_CLASS +CC_CARET_GET_CLASS +CC_IS_CARET +CC_IS_CARET_CLASS +CC_TYPE_CARET +cc_caret_get_type +
+ +
+circle +CcCircle +CcCircleClass +cc_circle_get_type +cc_circle_new +cc_circle_set_anchor +cc_circle_set_radius + +CC_CIRCLE +CC_CIRCLE_CLASS +CC_CIRCLE_GET_CLASS +CC_IS_CIRCLE +CC_IS_CIRCLE_CLASS +CC_TYPE_CIRCLE +
+ +
color CcColor +CcColorRgb +CcColorHsv CcColorClass cc_color_new_hsv cc_color_new_hsva cc_color_new_rgb cc_color_new_rgba cc_color_apply +cc_color_stop Colors cc_color_get_type +cc_color_hsv_get_type +cc_color_rgb_get_type CC_TYPE_COLOR CC_COLOR CC_COLOR_CLASS @@ -66,28 +125,85 @@
+cc-gradient +CcGradient +CcGradient +CcGradientClass +cc_gradient_add_stop +cc_gradient_create_pattern +cc_gradient_get_type + +CC_GRADIENT +CC_GRADIENT_CLASS +CC_GRADIENT_GET_CLASS +CC_IS_GRADIENT +CC_IS_GRADIENT_CLASS +CC_TYPE_GRADIENT +
+ +
+cc-hashmap +ccc/cc-hash-map.h +CcHashMap +cc_hash_map_foreach +cc_hash_map_insert +cc_hash_map_lookup +cc_hash_map_new +cc_hash_map_remove +Hash Map + +cc_hash_map_get_type +CcHashMapClass +CC_HASH_MAP +CC_HASH_MAP_CLASS +CC_HASH_MAP_GET_CLASS +CC_IS_HASH_MAP +CC_IS_HASH_MAP_CLASS +CC_TYPE_HASH_MAP +
+ +
item CcItem CcItemClass +cc_item_class_add_view_data +cc_item_get_view_data cc_item_new cc_item_append cc_item_dirty cc_item_distance -cc_item_get_extents cc_item_insert cc_item_remove cc_item_render cc_item_set_grid_aligned +cc_item_lower +cc_item_lower_to_bottom +cc_item_raise +cc_item_raise_to_top +cc_item_set_position CcItemFlags CC_ITEM_FLAGS CC_ITEM_DISPOSED CC_ITEM_GRID_ALIGNED CC_ITEM_SET_FLAGS CC_ITEM_UNSET_FLAGS +CC_ITEM_CAN_FOCUS +CcItemFunc +cc_item_add_view +cc_item_bounds_changed +cc_item_flags_get_type +cc_item_foreach_view +cc_item_get_all_bounds +cc_item_grab_focus +cc_item_is_child_of +cc_item_remove_view +cc_item_update_bounds +cc_item_update_bounds_for_view The Base Item cc_item_get_type CC_TYPE_ITEM +CC_TYPE_ITEM_FLAGS CC_ITEM CC_ITEM_CLASS CC_IS_ITEM @@ -97,17 +213,95 @@
item-view +CcItemView CcItemViewIface cc_item_view_register cc_item_view_unregister Item View -CcItemView cc_item_view_get_type CC_TYPE_ITEM_VIEW CC_ITEM_VIEW CC_IS_ITEM_VIEW CC_ITEM_VIEW_GET_CLASS +CC_ITEM_FUNC +
+ +
+line +CcLine +CcLineClass +cc_line_clear +cc_line_get_type +cc_line_line +cc_line_move +cc_line_new + +CC_IS_LINE +CC_IS_LINE_CLASS +CC_LINE +CC_LINE_CLASS +CC_LINE_GET_CLASS +CC_TYPE_LINE +
+ +
+cc-linear-gradient +CcLinearGradient +CcLinearGradientClass +cc_linear_gradient_get_type +cc_linear_gradient_new + +CC_TYPE_LINEAR_GRADIENT +
+ +
+pixbuf +CcPixbuf +CcPixbufClass +cc_pixbuf_get_rotation +cc_pixbuf_get_type +cc_pixbuf_new +cc_pixbuf_set_pixbuf +cc_pixbuf_set_position +cc_pixbuf_set_rotation +cc_pixbuf_set_position_x +cc_pixbuf_set_position_y + +CC_IS_PIXBUF +CC_PIXBUF +CC_TYPE_PIXBUF +
+ +
+printer +CcPrinter +CcPrinterClass +cc_printer_get_type +cc_printer_new +cc_printer_print_page + +CC_IS_PRINTER +CC_IS_PRINTER_CLASS +CC_PRINTER +CC_PRINTER_CLASS +CC_PRINTER_GET_CLASS +CC_TYPE_PRINTER +
+ +
+cc-radial-gradient +CcRadialGradient +CcRadialGradientClass +cc_radial_gradient_new +cc_radial_gradient_get_type + +CC_IS_RADIAL_GRADIENT +CC_IS_RADIAL_GRADIENT_CLASS +CC_RADIAL_GRADIENT +CC_RADIAL_GRADIENT_CLASS +CC_RADIAL_GRADIENT_GET_CLASS +CC_TYPE_RADIAL_GRADIENT
@@ -115,11 +309,11 @@ CcRectangle CcRectangleClass cc_rectangle_new -cc_rectangle_get_brush_border -cc_rectangle_set_brush_border -cc_rectangle_get_brush_content -cc_rectangle_set_brush_content cc_rectangle_set_position +cc_rectangle_set_height +cc_rectangle_set_width +cc_rectangle_set_x +cc_rectangle_set_y Rectangles cc_rectangle_get_type @@ -132,12 +326,73 @@
+rounded-rectangle +CcRoundedRectangle +CcRoundedRectangleClass +cc_rounded_rectangle_new +cc_rounded_rectangle_set_radius + +CC_ROUNDED_RECTANGLE +CC_ROUNDED_RECTANGLE_CLASS +CC_ROUNDED_RECTANGLE_GET_CLASS +CC_IS_ROUNDED_RECTANGLE +CC_IS_ROUNDED_RECTANGLE_CLASS +cc_rounded_rectangle_get_type +CC_TYPE_ROUNDED_RECTANGLE +
+ +
+shape +CcShape +CcShapeClass +cc_shape_get_brush_border +cc_shape_get_brush_content +cc_shape_get_type +cc_shape_get_width +cc_shape_set_brush_border +cc_shape_set_brush_content +cc_shape_set_width_pixels +cc_shape_set_width_units + +CC_IS_SHAPE +CC_IS_SHAPE_CLASS +CC_SHAPE +CC_SHAPE_CLASS +CC_SHAPE_GET_CLASS +CC_TYPE_SHAPE +
+ +
+ccc/cc-simple-item.h +cc-simple-item +Simple Item +CcSimpleItem +CcSimpleItemClass +cc_simple_item_new + +CC_IS_SIMPLE_ITEM +CC_IS_SIMPLE_ITEM_CLASS +CC_SIMPLE_ITEM +CC_SIMPLE_ITEM_CLASS +CC_SIMPLE_ITEM_GET_CLASS +CC_TYPE_SIMPLE_ITEM +cc_simple_item_get_type +
+ +
text CcText CcTextClass cc_text_new cc_text_set_anchor cc_text_set_anchor_type +cc_text_get_text +cc_text_is_editable +cc_text_set_editable +cc_text_set_font_description +cc_text_set_markup +cc_text_set_size_pixels +cc_text_set_text Text cc_text_get_type @@ -150,7 +405,25 @@
+cc-unit +ccc/cc-unit.h +Resolution Independence +CcDistance +CcUnit +cc_distance_new +cc_distance_copy +cc_distance_free + +CC_TYPE_DISTANCE +cc_distance_get_type +CC_TYPE_UNIT +cc_unit_get_type +
+ +
view +CcZoomMode +CcView CcViewIface cc_view_get_root cc_view_set_root @@ -158,14 +431,22 @@ cc_view_set_zoom cc_view_window_to_world cc_view_world_to_window +cc_view_get_focus +cc_view_get_scrolled_region +cc_view_grab_item +cc_view_set_focus +cc_view_set_scrolled_region +cc_view_ungrab_item +cc_view_world_to_window_distance Canvas Views -CcView cc_view_get_type CC_TYPE_VIEW CC_VIEW CC_IS_VIEW CC_VIEW_GET_CLASS +CC_TYPE_ZOOM_MODE +cc_zoom_mode_get_type
@@ -185,6 +466,21 @@
+png-writer +CcViewPNG +CcViewPNGClass +cc_view_png_get_type +cc_view_png_new + +CC_IS_VIEW_PNG +CC_IS_VIEW_PNG_CLASS +CC_TYPE_VIEW_PNG +CC_VIEW_PNG +CC_VIEW_PNG_CLASS +CC_VIEW_PNG_GET_CLASS +
+ +
view-widget CcViewWidget CcViewWidgetClass @@ -201,12 +497,16 @@ CC_VIEW_WIDGET_CLASS CC_VIEW_WIDGET_GET_CLASS CC_IS_VIEW_WIDGET_CLASS +cc_view_widget_get_zoom_mode +cc_view_widget_set_zoom_mode
utils cc_accumulator_boolean cc_point_grid_align +cc_return_if_unimplemented +cc_return_if_unimplemented_code Utilities
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc.types /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc.types --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc.types 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc.types 2007-05-05 23:29:46.000000000 +0100 @@ -1,12 +1,29 @@ #include -cc_brush_get_type cc_brush_color_get_type +cc_brush_get_type +cc_camera_get_type +cc_caret_get_type +cc_circle_get_type cc_color_get_type +cc_color_hsv_get_type +cc_color_rgb_get_type +cc_gradient_get_type +cc_hash_map_get_type cc_item_get_type +cc_item_view_get_type +cc_line_get_type +cc_linear_gradient_get_type +cc_pixbuf_get_type +cc_printer_get_type +cc_radial_gradient_get_type cc_rectangle_get_type +cc_rounded_rectangle_get_type +cc_shape_get_type +cc_simple_item_get_type cc_text_get_type -cc_view_get_type cc_view_cell_renderer_get_type +cc_view_get_type +cc_view_png_get_type cc_view_widget_get_type Binary files /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-view-data.png and /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-view-data.png differ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-view-data.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-view-data.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/ccc-view-data.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/ccc-view-data.xml 2007-05-04 20:40:51.000000000 +0100 @@ -0,0 +1,175 @@ + + View-Specific Data + + + Sometimes it's useful to store some data that is connected to + a view. Every CcItem stores its bounding box in a view-dependent + way because different resolutions might result in different + bounding box sizes. CCC contains an API that makes using such + data as easy as using private + data with GObject. + + + + + + In this example we're creating an item that counts the number of clicks + that have happened per view. We're creating a type called SliffSloff and + the macro returning the GType will be SLIFF_TYPE_SLOFF. + + + + Specifying View-Specific Data + + + To store some view-specific data, you have to specify a + structure that will be created for each view: + + + + + + Now we need to instruct libccc that we want this struct + to contain our view-specific data: + + + view_register = sliff_sloff_view_register; + item_class->view_unregister = sliff_sloff_view_unregister; + + /* Require the size of a SliffSloffViewData for the view data */ + cc_item_class_add_view_data (self_class, sizeof (SliffSloffViewData)); +}]]> + + + + Accessing View-Specific Data + + + CCC makes it very easy to access the view-specific data of + an item. Calling cc_item_get_view_data + will return a pointer to the memory chunk that stores the + view-specific data for a certain view of a certain item. + + + + But to make accessing this piece of memory easier, you can + define a macro that helps you to get the data: + + + + + + Then you can easily access the view-data for a certain item + by calling GET_VIEW_DATA(item, view): + + + click_counter++; +}]]> + + + + Memory Management + + + This section explains the details of the memory management + that's implemented in CCC. It's useful to read this section + at least once to understand the lifecycle of view-specific + data. + + + + Allocate and Initialize the Memory + + + The memory allocation happens as early as possible. + The memory for the view-data gets allocated within + the default implementation of the CcItem::view-register + signal. + + + + This means that custom implementations of CcItem::view-register + absolutely need to chain up before + executing custom statements. + + + + After chaining up, you can initialize the data. It will be + pre-initialized with 0 so you don't have to initialize + integers or pointers to be 0 or NULL. + + + + allocate the memory */ + CC_ITEM_CLASS (sliff_sloff_parent_class)->view_register (item, view); + + view_data = GET_VIEW_DATA (item, view); + + /* your custom code (not necessary in this case) */ + view_data->click_counter = 0; +}]]> + + + + Clear and Free the Memory + + + Removing the view-specific data works exactly + the other way round. First you clean up the + memory and then you chain up into the CcItem::view-unregister + handler of the parent class to free the memory. + + + click_counter, + G_OBJECT_TYPE_NAME (view), view); + + /* here you can unref objects that you created per view */ + view_data->click_counter = 0; + + /* call view_unregister from the parent class => free the memory */ + CC_ITEM_CLASS (sliff_sloff_parent_class)->view_unregister (item, view); +}]]> + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/CcCamera.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/CcCamera.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/CcCamera.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/CcCamera.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,218 @@ + + + + +CcCamera + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+CcCamera +

+

CcCamera

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcCamera;
+typedef             CcCameraClass;
+CcItem*             cc_camera_new                       (void);
+CcItem*             cc_camera_new_root                  (CcItem *root);
+CcItem*             cc_camera_get_root                  (CcItem const*self);
+void                cc_camera_set_root                  (CcCamera *self,
+                                                         CcItem *root);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcCamera
+
+
+
+

Implemented Interfaces

+

+CcCamera implements + CcView and CcItemView.

+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcCamera

+
typedef CcItem      CcCamera;
+
+

+ +

+
+
+
+

+CcCameraClass

+
typedef CcItemClass CcCameraClass;
+
+

+ +

+
+
+
+

+cc_camera_new ()

+
CcItem*             cc_camera_new                       (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_camera_new_root ()

+
CcItem*             cc_camera_new_root                  (CcItem *root);
+

+ +

+
++ + + + + + + + + + +
root : +
Returns : + + +
+
+
+
+

+cc_camera_get_root ()

+
CcItem*             cc_camera_get_root                  (CcItem const*self);
+

+ +

+
++ + + + + + + + + + +
self : +
Returns : + + +
+
+
+
+

+cc_camera_set_root ()

+
void                cc_camera_set_root                  (CcCamera *self,
+                                                         CcItem *root);
+

+ +

+
++ + + + + + + + + + +
self : +
root : + + +
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-API-Reference.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-API-Reference.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-API-Reference.html 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-API-Reference.html 2007-05-05 23:29:45.000000000 +0100 @@ -2,38 +2,39 @@ -Part III. API Reference - +Part II. API Reference + - + - + - + + - + + + + + + - - - - - - +

-API Reference

+Part II. API Reference diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Bounds-Handling.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Bounds-Handling.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Bounds-Handling.html 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Bounds-Handling.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Bounds Handling - + - - + + - + - + + - + + + + + + - - - - - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Brushes.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Brushes.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Brushes.html 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Brushes.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Brushes - + - + - + + - + + + + + + - - - - - @@ -34,20 +35,20 @@ - + Object Hierarchy

-Brushes +Brushes

-

Brushes —

+

Brushes
@@ -55,52 +56,58 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcBrush;
-            CcBrushClass;
-void        cc_brush_apply                  (CcBrush *self,
-                                             CcBrush;
+                    CcBrushClass;
+void                cc_brush_apply                      (CcBrush *self,
+                                                         CcView *view,
+                                                         CcItem *item,
+                                                         cairo_t *cr);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
    +----GInitiallyUnowned
          +----CcBrush
                +----CcBrushColor
+               +----CcGradient
-

Description

+

Description

-

Details

+

Details

-

+

CcBrush

-
typedef struct _CcBrush CcBrush;
+
typedef struct _CcBrush CcBrush;

-

+

CcBrushClass

-
typedef struct {
+
typedef struct {
 	GInitiallyUnownedClass base_class;
 
 	/* vtable */
 	void (*apply) (CcBrush* brush,
+		       CcView * view,
+		       CcItem * item,
 		       cairo_t* cr);
 } CcBrushClass;
 

@@ -113,14 +120,12 @@
 
 
 
-
-GInitiallyUnownedClass base_class;
+GInitiallyUnownedClass base_class;
  the parent class for GType
 
 
 
-
-apply ()
+apply ()
  the virtual function that's called from cc_brush_apply()
 
 
@@ -129,15 +134,20 @@
-

+

cc_brush_apply ()

-
void        cc_brush_apply                  (CcBrush *self,
-                                             
void                cc_brush_apply                      (CcBrush *self,
+                                                         CcView *view,
+                                                         CcItem *item,
+                                                         cairo_t *cr);

 

-Apply a brush to a cairo context. This is usually used from item
-implementations while rendering to a context.

+Apply a brush to a cairo context. The brush will be used to display item in
+view.
+

+

+This is usually used from item implementations while rendering to a context.

 

 
 

@@ -145,14 +155,22 @@
 
 
 
-
-self :
+self :
  a CcBrush
 
 
 
-
-cr :
+view :
+ a CcView
+
+
+
+item :
+ a CcItem
+
+
+
+cr :
  a cairo context
 
 
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Canvas-Items.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Canvas-Items.html
--- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Canvas-Items.html	2006-09-03 19:57:14.000000000 +0100
+++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Canvas-Items.html	2007-05-05 23:29:45.000000000 +0100
@@ -3,27 +3,28 @@
 
 
 Canvas Items
-
+
 
-
+
 
 
-
+
 
 
-
+
+
 
-
+
+
+
+
+
+
 
 
 
 
 
-
-
-
-
-
 
 
 
@@ -38,13 +39,37 @@
 Canvas Items

 

-The Base Item - 
+The Base Item
+

+

+Simple Item
+

+

+shape
+

+

+line
+

+

+circle
+

+

+Rectangles
+

+

+rounded-rectangle
+

+

+pixbuf
+

+

+Text
 

 

-Rectangles - 
+cc-caret
 

 

-Text - 
+CcCamera
 

 

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Canvas-Views.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Canvas-Views.html
--- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Canvas-Views.html	2006-09-03 19:57:14.000000000 +0100
+++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Canvas-Views.html	2007-05-05 23:29:45.000000000 +0100
@@ -3,27 +3,28 @@
 Canvas Views
-
+
-
+
-
+
+
-
+
+
+
+
+
+
-
-
-
-
-
@@ -34,55 +35,138 @@
 
-
+                  Known Implementations
+                   | 
+                  Properties
 

 

 

 
 

-Canvas Views
+Canvas Views
 

-
Canvas Views — 

+
Canvas Views

 		
 
 

 

 
Synopsis

-
+
 
+#include <ccc.h>
 
 
-            CcViewIface;
-CcItem*     cc_view_get_root                (CcView *self);
-void        cc_view_set_root                (CcView *self,
-                                             CcItem *root);
-gdouble     cc_view_get_zoom                (CcView *self);
-void        cc_view_set_zoom                (CcView *self,
-                                             gdouble zoom);
-void        cc_view_window_to_world         (CcView *self,
-                                             gdouble *x,
-                                             gdouble *y);
-void        cc_view_world_to_window         (CcView *self,
-                                             gdouble *x,
-                                             gdouble *y);
+enum                CcZoomMode;
+                    CcView;
+                    CcViewIface;
+CcItem*             cc_view_get_root                    (CcView *self);
+void                cc_view_set_root                    (CcView *self,
+                                                         CcItem *root);
+gdouble             cc_view_get_zoom                    (CcView *self);
+void                cc_view_set_zoom                    (CcView *self,
+                                                         gdouble zoom);
+void                cc_view_window_to_world             (CcView const*self,
+                                                         gdouble *x,
+                                                         gdouble *y);
+void                cc_view_world_to_window             (CcView const*self,
+                                                         gdouble *x,
+                                                         gdouble *y);
+CcItem*             cc_view_get_focus                   (const CcView *self);
+CcDRect*            cc_view_get_scrolled_region         (CcView *self);
+gint                cc_view_grab_item                   (CcView *self,
+                                                         CcItem *item,
+                                                         GdkEventMask mask,
+                                                         GdkCursor *cursor,
+                                                         guint32 time);
+void                cc_view_set_focus                   (CcView *self,
+                                                         CcItem *focus);
+void                cc_view_set_scrolled_region         (CcView *self,
+                                                         CcDRect const*scrolled_region);
+void                cc_view_ungrab_item                 (CcView *self,
+                                                         CcItem *item,
+                                                         guint32 time);
+void                cc_view_world_to_window_distance    (CcView const*self,
+                                                         gdouble *x,
+                                                         gdouble *y);
 
 

 

 

-
Description

+
Object Hierarchy

+
+
+  GInterface
+   +----CcView
+

+

+

+
Prerequisites

+

+CcView requires
+ CcItemView and  GObject.

+

+

+
Known Implementations

+

+CcView is implemented by
+ CcCamera,  CcViewCellRenderer and  CcViewWidget.

+

+

+
Properties

+
+
+  "focus"                    CcItem                : Read / Write
+  "root"                     CcItem                : Read / Write
+  "scrolled-region"          CcDRect               : Read / Write
+  "zoom"                     gdouble               : Read / Write / Construct
+  "zoom-mode"                CcZoomMode            : Read / Write
+

+

+

+
Description

 

 
 

 

 

-
Details

+
Details

+

+

+enum CcZoomMode

+
typedef enum {
+	CC_ZOOM_PIXELS,
+	CC_ZOOM_WIDTH,
+	CC_ZOOM_HEIGHT,
+	CC_ZOOM_AUTO
+} CcZoomMode;
+

+

+
+

+

+

+

+

+CcView

+
typedef struct _CcView CcView;

+

+
+

+

+

 

-

+

 CcViewIface

-
typedef struct {
+
typedef struct {
 	GTypeInterface base_iface;
 
 	/* vtable */
@@ -94,13 +178,13 @@
 	void          (*ungrab_item)             (CcView      * self,
 					          CcItem      * item,
 					          guint32       time);
-	void          (*window_to_world)         (CcView      * self,
+	void          (*window_to_world)         (CcView const* self,
 				                  gdouble     * x,
 				                  gdouble     * y);
-	void          (*world_to_window)         (CcView      * self,
+	void          (*world_to_window)         (CcView const* self,
 				                  gdouble     * x,
 				                  gdouble     * y);
-	void          (*world_to_window_distance)(CcView      * self,
+	void          (*world_to_window_distance)(CcView const* self,
 					          gdouble     * x,
 					          gdouble     * y);
 } CcViewIface;
@@ -111,9 +195,9 @@
 

 

 

-

+

 cc_view_get_root ()

-
CcItem*     cc_view_get_root                (CcView *self);

+
CcItem*             cc_view_get_root                    (CcView *self);

 

 Get the model that's displayed by self.

 

@@ -123,14 +207,12 @@
 
 
 
-
-self :
- a CcView
+self :
+ a CcView
 
 
 
-
-Returns :
+Returns :
 the CcItem that's displayed by self, may be NULL.
 
 
@@ -139,10 +221,10 @@
 

 

 

-

+

 cc_view_set_root ()

-
void        cc_view_set_root                (CcView *self,
-                                             CcItem *root);

+
void                cc_view_set_root                    (CcView *self,
+                                                         CcItem *root);

 

 Set root as the model to be displayed in self.

 

@@ -152,14 +234,12 @@
 
 
 
-
-self :
- a CcView
+self :
+ a CcView
 
 
 
-
-root :
+root :
  a CcItem
 
 
@@ -168,9 +248,9 @@
 

 

 

-

+

 cc_view_get_zoom ()

-
gdouble     cc_view_get_zoom                (CcView *self);

+
gdouble             cc_view_get_zoom                    (CcView *self);

 

 Get the zoom of the view.

 

@@ -180,14 +260,12 @@
 
 
 
-
-self :
- a CcView
+self :
+ a CcView
 
 
 
-
-Returns :
+Returns :
 the zoom of the view.
 
 
@@ -196,10 +274,10 @@
 

 

 

-

+

 cc_view_set_zoom ()

-
void        cc_view_set_zoom                (CcView *self,
-                                             gdouble zoom);

+
void                cc_view_set_zoom                    (CcView *self,
+                                                         gdouble zoom);

 

 Set the zoom of the canvas.

 

@@ -209,14 +287,12 @@
 
 
 
-
-self :
- a CcView
+self :
+ a CcView
 
 
 
-
-zoom :
+zoom :
  a new zoom value
 
 
@@ -225,11 +301,11 @@
 

 

 

-

+

 cc_view_window_to_world ()

-
void        cc_view_window_to_world         (CcView *self,
-                                             gdouble *x,
-                                             gdouble *y);

+
void                cc_view_window_to_world             (CcView const*self,
+                                                         gdouble *x,
+                                                         gdouble *y);

 

 Convert window_x and window_y to world_x and world_y if given.

 

@@ -239,20 +315,17 @@
 
 
 
-
-self :
- a CcView
+self :
+ a CcView
 
 
 
-
-x :
+x :
  target for a world coordinate, may be NULL
 
 
 
-
-y :
+y :
  target for a world coordinate, may be NULL
 
 
@@ -261,11 +334,11 @@
 

 

 

-

+

 cc_view_world_to_window ()

-
void        cc_view_world_to_window         (CcView *self,
-                                             gdouble *x,
-                                             gdouble *y);

+
void                cc_view_world_to_window             (CcView const*self,
+                                                         gdouble *x,
+                                                         gdouble *y);

 

 Convert x and y to window coordinates if given.

 

@@ -275,26 +348,287 @@
 
 
 
+self :
+ a CcView
+
+
+
+x :
+ target for a window coordinate, may be NULL
+
+
+
+y :
+ target for a window coordinate, may be NULL
+
+
+
+

+

+

+

+

+cc_view_get_focus ()

+
CcItem*             cc_view_get_focus                   (const CcView *self);

+

+
+

+

++
+
+
-
+
-
+
+
+


self :
 
-self : a CcView
 
 

 
Returns :
 
-x : target for a window coordinate, may be NULL
+
+
+

+

+

+

+

+cc_view_get_scrolled_region ()

+
CcDRect*            cc_view_get_scrolled_region         (CcView *self);

+

+Get the scrolled region of this view.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


self : a CcView
+
Returns :the scrolled region of this view.
+

+

+

+

+

+cc_view_grab_item ()

+
gint                cc_view_grab_item                   (CcView *self,
+                                                         CcItem *item,
+                                                         GdkEventMask mask,
+                                                         GdkCursor *cursor,
+                                                         guint32 time);

+

+Grab the item.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


self : a CcView
+
item : a CcItem
+
mask : a GdkEventMask
+
cursor : a GdkCursor
 
 

 
time : the time
+
Returns :
+GDK_GRAB_NOT_VIEWABLE if the view cannot grab at all.
+

+

+

+

+

+cc_view_set_focus ()

+
void                cc_view_set_focus                   (CcView *self,
+                                                         CcItem *focus);

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


self :
+
focus :
+
+
+

+

+

+

+

+cc_view_set_scrolled_region ()

+
void                cc_view_set_scrolled_region         (CcView *self,
+                                                         CcDRect const*scrolled_region);

+

+Set scrolled_region as the region to be displayed and/or reachable with
+scrollbars.

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+


self : a CcView
+
scrolled_region : a CcItem
+

+

+

+

+

+cc_view_ungrab_item ()

+
void                cc_view_ungrab_item                 (CcView *self,
+                                                         CcItem *item,
+                                                         guint32 time);

+

+
+

+

++
+
+
-
+
+
+
+
+
+
+
+


self :
 
-y : target for a window coordinate, may be NULL
+
item :
+
time :
+
+
 
 

 
 

 

+

+

+

+cc_view_world_to_window_distance ()

+
void                cc_view_world_to_window_distance    (CcView const*self,
+                                                         gdouble *x,
+                                                         gdouble *y);

+

+Convert x and y to window coordinates

+

+
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


self : a CcView
+
x : target for a window distance, may be NULL
+
y : target for a window distance, may be NULL
+

+

+

+

+
Property Details

+

+

+The "focus" property

+
  "focus"                    CcItem                : Read / Write

+
Focus.

+

+

+

+

+The "root" property

+
  "root"                     CcItem                : Read / Write

+
The root element of this canvas.

+

+

+

+

+The "scrolled-region" property

+
  "scrolled-region"          CcDRect               : Read / Write

+
scrolled-region.

+

+

+

+

+The "zoom" property

+
  "zoom"                     gdouble               : Read / Write / Construct

+
Zoom.

+
Allowed values: >= G_MINDOUBLE

+
Default value: 1

+

+

+

+

+The "zoom-mode" property

+
  "zoom-mode"                CcZoomMode            : Read / Write

+
BLURB.

+
Default value: CC_ZOOM_PIXELS

+
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-cc-caret.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-cc-caret.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-cc-caret.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-cc-caret.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,187 @@ + + + + +cc-caret + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+cc-caret +

+

cc-caret

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcCaret;
+typedef             CcCaretClass;
+CcItem*             cc_caret_new                        (void);
+void                cc_caret_set_position               (CcCaret *self,
+                                                         gdouble x1,
+                                                         gdouble y1,
+                                                         gdouble x2,
+                                                         gdouble y2);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcShape
+                     +----CcLine
+                           +----CcCaret
+
+
+
+

Implemented Interfaces

+

+CcCaret implements + CcItemView.

+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcCaret

+
typedef CcLine      CcCaret;
+
+

+ +

+
+
+
+

+CcCaretClass

+
typedef CcLineClass CcCaretClass;
+
+

+ +

+
+
+
+

+cc_caret_new ()

+
CcItem*             cc_caret_new                        (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_caret_set_position ()

+
void                cc_caret_set_position               (CcCaret *self,
+                                                         gdouble x1,
+                                                         gdouble y1,
+                                                         gdouble x2,
+                                                         gdouble y2);
+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +
self : +
x1 : +
y1 : +
x2 : +
y2 : + + +
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-cc-linear-gradient.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-cc-linear-gradient.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-cc-linear-gradient.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-cc-linear-gradient.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,244 @@ + + + + +cc-linear-gradient + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+cc-linear-gradient +

+

cc-linear-gradient

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcLinearGradient;
+typedef             CcLinearGradientClass;
+GType               cc_linear_gradient_get_type         (void);
+CcBrush*            cc_linear_gradient_new              (gdouble x1,
+                                                         gdouble y1,
+                                                         gdouble x2,
+                                                         gdouble y2);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcBrush
+               +----CcGradient
+                     +----CcLinearGradient
+
+
+
+

Properties

+
+
+  "x1"                       gdouble               : Read / Write
+  "x2"                       gdouble               : Read / Write
+  "y1"                       gdouble               : Read / Write
+  "y2"                       gdouble               : Read / Write
+
+
+
+

Description

+

+Linear gradients are a very nice pattern to fill items with. To permit +gradients to be applied to different items, the API got designed a bit +tricky (but still easy to understand). +

+

+Instead of working with exact coordinates on items, you specify two points +for the gradient (the start and the end) relative to the item's bounding +box. +

+

+A gradient from (0.0; 0.0) to (1.0; 1.0) applied to a square will result in +a linear gradient from the north-western corner of the square to the +south-eastern corner. +

+

+A gradient from (0.5; 0.0) to (0.5; 1.0) applied to a square will result in +a gradient from the top to the bottom. +

+

+Of course, you are not limited to the bounding box of your item. A gradient +like this can also be applied: (-0.25; 0.0) to (0.5; 1.0).

+

+ +

+
+
+

Details

+
+

+CcLinearGradient

+
typedef CcGradient      CcLinearGradient;
+
+

+ +

+
+
+
+

+CcLinearGradientClass

+
typedef CcGradientClass CcLinearGradientClass;
+
+

+ +

+
+
+
+

+cc_linear_gradient_get_type ()

+
GType               cc_linear_gradient_get_type         (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_linear_gradient_new ()

+
CcBrush*            cc_linear_gradient_new              (gdouble x1,
+                                                         gdouble y1,
+                                                         gdouble x2,
+                                                         gdouble y2);
+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +
x1 : +
y1 : +
x2 : +
y2 : +
Returns : + + +
+
+
+
+

Property Details

+
+

+The "x1" property

+
  "x1"                       gdouble               : Read / Write
+

The first horizontal point.

+

Default value: 0

+
+
+
+

+The "x2" property

+
  "x2"                       gdouble               : Read / Write
+

The second horizontal point.

+

Default value: 1

+
+
+
+

+The "y1" property

+
  "y1"                       gdouble               : Read / Write
+

The first vertical point.

+

Default value: 0

+
+
+
+

+The "y2" property

+
  "y2"                       gdouble               : Read / Write
+

The second vertical point.

+

Default value: 1

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-cc-radial-gradient.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-cc-radial-gradient.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-cc-radial-gradient.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-cc-radial-gradient.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,211 @@ + + + + +cc-radial-gradient + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+cc-radial-gradient +

+

cc-radial-gradient

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcRadialGradient;
+typedef             CcRadialGradientClass;
+CcBrush*            cc_radial_gradient_new              (gdouble x,
+                                                         gdouble y,
+                                                         gdouble radius);
+GType               cc_radial_gradient_get_type         (void);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcBrush
+               +----CcGradient
+                     +----CcRadialGradient
+
+
+
+

Properties

+
+
+  "radius"                   gdouble               : Read / Write
+  "x"                        gdouble               : Read / Write
+  "y"                        gdouble               : Read / Write
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcRadialGradient

+
typedef CcGradient      CcRadialGradient;
+
+

+ +

+
+
+
+

+CcRadialGradientClass

+
typedef CcGradientClass CcRadialGradientClass;
+
+

+ +

+
+
+
+

+cc_radial_gradient_new ()

+
CcBrush*            cc_radial_gradient_new              (gdouble x,
+                                                         gdouble y,
+                                                         gdouble radius);
+

+Create a new radial gradient. +

+

+x, y and radius are given in a relation to the item's size and position: +eg. 0.5 means either "in the middle" (for x and y) or "half the size" (for +radius).

+

+ +

+
++ + + + + + + + + + + + + + + + + + +
x : the x position of the gradient's center +
y : the y position of the gradient's center +
radius : the radius of the gradient's circle +
Returns :a new CcRadialGradient. +
+
+
+
+

+cc_radial_gradient_get_type ()

+
GType               cc_radial_gradient_get_type         (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

Property Details

+
+

+The "radius" property

+
  "radius"                   gdouble               : Read / Write
+

Gradient Radius.

+

Default value: 0.5

+
+
+
+

+The "x" property

+
  "x"                        gdouble               : Read / Write
+

Horizontal position of the gradient center.

+

Default value: 0.5

+
+
+
+

+The "y" property

+
  "y"                        gdouble               : Read / Write
+

Vertical position of the gradient center.

+

Default value: 0.5

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Cell-Renderer.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Cell-Renderer.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Cell-Renderer.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Cell-Renderer.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Cell Renderer - + - + - + + - + + + + + + - - - - - @@ -34,20 +35,22 @@ - + Implemented Interfaces

-Cell Renderer +Cell Renderer

-

Cell Renderer —

+

Cell Renderer
@@ -55,16 +58,17 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcViewCellRenderer;
-            CcViewCellRendererClass;
-GtkCellRenderer* cc_view_cell_renderer_new  (void);
+                    CcViewCellRenderer;
+                    CcViewCellRendererClass;
+GtkCellRenderer*    cc_view_cell_renderer_new           (void);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
@@ -75,26 +79,32 @@
-

Description

+

Implemented Interfaces

+

+CcViewCellRenderer implements + CcView and CcItemView.

+
+
+

Description

-

Details

+

Details

-

+

CcViewCellRenderer

-
typedef struct _CcViewCellRenderer CcViewCellRenderer;
+
typedef struct _CcViewCellRenderer CcViewCellRenderer;

-

+

CcViewCellRendererClass

-
typedef struct {
+
typedef struct {
 	GtkCellRendererClass base_class;
 } CcViewCellRendererClass;
 

@@ -104,20 +114,20 @@
-

+

cc_view_cell_renderer_new ()

-
GtkCellRenderer* cc_view_cell_renderer_new  (void);
+
GtkCellRenderer*    cc_view_cell_renderer_new           (void);
+

+Creates a GtkCellRenderer that can be used to display a canvas in a +GtkCellLayout (like GtkTreeView or GtkComboBox).

- - +
-Returns : - - +Returns :a new instance of CcViewCellRenderer.
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-circle.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-circle.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-circle.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-circle.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,250 @@ + + + + +circle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+circle +

+

circle

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+                    CcCircle;
+                    CcCircleClass;
+GType               cc_circle_get_type                  (void);
+CcItem*             cc_circle_new                       (void);
+void                cc_circle_set_anchor                (CcCircle *self,
+                                                         gdouble x,
+                                                         gdouble y);
+void                cc_circle_set_radius                (CcCircle *self,
+                                                         gdouble radius);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcShape
+                     +----CcCircle
+
+
+
+

Implemented Interfaces

+

+CcCircle implements + CcItemView.

+
+
+

Properties

+
+
+  "anchor"                   gpointer              : 
+  "radius"                   gdouble               : Read / Write
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcCircle

+
typedef struct _CcCircle CcCircle;
+

+ +

+
+
+
+

+CcCircleClass

+
typedef struct {
+	CcShapeClass base_class;
+} CcCircleClass;
+
+

+ +

+
+
+
+

+cc_circle_get_type ()

+
GType               cc_circle_get_type                  (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_circle_new ()

+
CcItem*             cc_circle_new                       (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_circle_set_anchor ()

+
void                cc_circle_set_anchor                (CcCircle *self,
+                                                         gdouble x,
+                                                         gdouble y);
+

+ +

+
++ + + + + + + + + + + + + + +
self : +
x : +
y : + + +
+
+
+
+

+cc_circle_set_radius ()

+
void                cc_circle_set_radius                (CcCircle *self,
+                                                         gdouble radius);
+

+Specifies the radius of the circle.

+

+ +

+
++ + + + + + + + + + +
self : a CcCircle +
radius : the new radius +
+
+
+
+

Property Details

+
+

+The "anchor" property

+
  "anchor"                   gpointer              :
+

The center of the circle.

+
+
+
+

+The "radius" property

+
  "radius"                   gdouble               : Read / Write
+

Radius.

+

Allowed values: >= 0

+

Default value: 0

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Color-Brush.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Color-Brush.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Color-Brush.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Color-Brush.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Color Brush - + - + - + + - + + + + + + - - - - - @@ -34,22 +35,22 @@ - + Properties

-Color Brush +Color Brush

-

Color Brush —

+

Color Brush
@@ -57,19 +58,20 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcBrushColor;
-            CcBrushColorClass;
-CcBrush*    cc_brush_color_new              (CcColor *color);
-CcColor*    cc_brush_color_get_color        (CcBrushColor *self);
-void        cc_brush_color_set_color        (CcBrushColor *self,
-                                             CcColor *color);
+                    CcBrushColor;
+                    CcBrushColorClass;
+CcBrush*            cc_brush_color_new                  (CcColor *color);
+CcColor*            cc_brush_color_get_color            (CcBrushColor *self);
+void                cc_brush_color_set_color            (CcBrushColor *self,
+                                                         CcColor *color);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
@@ -79,33 +81,33 @@
-

Properties

+

Properties

 
-  "color"                CcColor               : Read / Write / Construct
+  "color"                    CcColor               : Read / Write / Construct
-

Description

+

Description

-

Details

+

Details

-

+

CcBrushColor

-
typedef struct _CcBrushColor CcBrushColor;
+
typedef struct _CcBrushColor CcBrushColor;

-

+

CcBrushColorClass

-
typedef struct {
+
typedef struct {
 	CcBrushClass base_class;
 } CcBrushColorClass;
 

@@ -115,9 +117,9 @@
-

+

cc_brush_color_new ()

-
CcBrush*    cc_brush_color_new              (CcColor *color);
+
CcBrush*            cc_brush_color_new                  (CcColor *color);

@@ -125,14 +127,12 @@ - -color : +color : - -Returns : +Returns : @@ -143,9 +143,9 @@
-

+

cc_brush_color_get_color ()

-
CcColor*    cc_brush_color_get_color        (CcBrushColor *self);
+
CcColor*            cc_brush_color_get_color            (CcBrushColor *self);

@@ -153,14 +153,12 @@ - -self : +self : - -Returns : +Returns : @@ -171,10 +169,10 @@
-

+

cc_brush_color_set_color ()

-
void        cc_brush_color_set_color        (CcBrushColor *self,
-                                             CcColor *color);
+
void                cc_brush_color_set_color            (CcBrushColor *self,
+                                                         CcColor *color);

@@ -182,14 +180,12 @@ - -self : +self : - -color : +color : @@ -200,11 +196,11 @@
-

Property Details

+

Property Details

-

+

The "color" property

-
  "color"                CcColor               : Read / Write / Construct
+
  "color"                    CcColor               : Read / Write / Construct

The color.

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Colors.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Colors.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Colors.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Colors.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Colors - + - - + + - + + - + + + + + + - - - - - @@ -32,98 +33,152 @@ - + - + Properties

-Colors +Colors

-

Colors —

+

Colors

Synopsis

-
+
 
+#include <ccc.h>
 
 
-            CcColor;
-            CcColorClass;
-CcColor*    cc_color_new_hsv                (gdouble hue,
-                                             gdouble saturation,
-                                             gdouble value);
-CcColor*    cc_color_new_hsva               (gdouble hue,
-                                             gdouble saturation,
-                                             gdouble value,
-                                             gdouble alpha);
-CcColor*    cc_color_new_rgb                (gdouble red,
-                                             gdouble green,
-                                             gdouble blue);
-CcColor*    cc_color_new_rgba               (gdouble red,
-                                             gdouble green,
-                                             gdouble blue,
-                                             gdouble alpha);
-void        cc_color_apply                  (CcColor *self,
-                                             cairo_t *cr);
+                    CcColor;
+typedef             CcColorRgb;
+typedef             CcColorHsv;
+                    CcColorClass;
+CcColor*            cc_color_new_hsv                    (gdouble hue,
+                                                         gdouble saturation,
+                                                         gdouble value);
+CcColor*            cc_color_new_hsva                   (gdouble hue,
+                                                         gdouble saturation,
+                                                         gdouble value,
+                                                         gdouble alpha);
+CcColor*            cc_color_new_rgb                    (gdouble red,
+                                                         gdouble green,
+                                                         gdouble blue);
+CcColor*            cc_color_new_rgba                   (gdouble red,
+                                                         gdouble green,
+                                                         gdouble blue,
+                                                         gdouble alpha);
+void                cc_color_apply                      (CcColor const *self,
+                                                         gdouble *red,
+                                                         gdouble *green,
+                                                         gdouble *blue,
+                                                         gdouble *alpha);
+void                cc_color_stop                       (CcColor const *self,
+                                                         cairo_pattern_t *pattern,
+                                                         gdouble offset);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
    +----GInitiallyUnowned
          +----CcColor
+               +----CcColorHsv
+               +----CcColorRgb
+
+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcColor
+               +----CcColorRgb
+
+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcColor
+               +----CcColorHsv
-

Properties

+

Properties

 
-  "alpha"                gdouble               : Read / Write / Construct
+  "alpha"                    gdouble               : Read / Write / Construct
+  "blue"                     gdouble               : Read / Write / Construct
+  "green"                    gdouble               : Read / Write / Construct
+  "red"                      gdouble               : Read / Write / Construct
+  "hue"                      gdouble               : Read / Write / Construct
+  "saturation"               gdouble               : Read / Write / Construct
+  "value"                    gdouble               : Read / Write / Construct
-

Description

+

Description

-

Details

+

Details

-

+

CcColor

-
typedef struct _CcColor CcColor;
+
typedef struct _CcColor CcColor;
+

+ +

+
+
+
+

+CcColorRgb

+
typedef CcColor CcColorRgb;
+

-

+

+CcColorHsv

+
typedef CcColor CcColorHsv;
+
+

+ +

+
+
+
+

CcColorClass

-
typedef struct {
+
typedef struct {
 	GInitiallyUnownedClass base_class;
 
 	/* vtable */
 	void (*apply) (CcColor const* self,
-		       cairo_t      * cr);
+		       gdouble      * red,
+		       gdouble      * green,
+		       gdouble      * blue,
+		       gdouble      * alpha);
 } CcColorClass;
 

 

@@ -132,11 +187,11 @@
-

+

cc_color_new_hsv ()

-
CcColor*    cc_color_new_hsv                (gdouble hue,
-                                             gdouble saturation,
-                                             gdouble value);
+
CcColor*            cc_color_new_hsv                    (gdouble hue,
+                                                         gdouble saturation,
+                                                         gdouble value);

@@ -144,26 +199,22 @@ - -hue : +hue : - -saturation : +saturation : - -value : +value : - -Returns : +Returns : @@ -174,12 +225,12 @@
-

+

cc_color_new_hsva ()

-
CcColor*    cc_color_new_hsva               (gdouble hue,
-                                             gdouble saturation,
-                                             gdouble value,
-                                             gdouble alpha);
+
CcColor*            cc_color_new_hsva                   (gdouble hue,
+                                                         gdouble saturation,
+                                                         gdouble value,
+                                                         gdouble alpha);

@@ -187,32 +238,27 @@ - -hue : +hue : - -saturation : +saturation : - -value : +value : - -alpha : +alpha : - -Returns : +Returns : @@ -223,11 +269,11 @@
-

+

cc_color_new_rgb ()

-
CcColor*    cc_color_new_rgb                (gdouble red,
-                                             gdouble green,
-                                             gdouble blue);
+
CcColor*            cc_color_new_rgb                    (gdouble red,
+                                                         gdouble green,
+                                                         gdouble blue);

@@ -235,26 +281,22 @@ - -red : +red : - -green : +green : - -blue : +blue : - -Returns : +Returns : @@ -265,12 +307,12 @@
-

+

cc_color_new_rgba ()

-
CcColor*    cc_color_new_rgba               (gdouble red,
-                                             gdouble green,
-                                             gdouble blue,
-                                             gdouble alpha);
+
CcColor*            cc_color_new_rgba                   (gdouble red,
+                                                         gdouble green,
+                                                         gdouble blue,
+                                                         gdouble alpha);

@@ -278,32 +320,27 @@ - -red : +red : - -green : +green : - -blue : +blue : - -alpha : +alpha : - -Returns : +Returns : @@ -314,12 +351,16 @@
-

+

cc_color_apply ()

-
void        cc_color_apply                  (CcColor *self,
-                                             cairo_t *cr);
+
void                cc_color_apply                      (CcColor const *self,
+                                                         gdouble *red,
+                                                         gdouble *green,
+                                                         gdouble *blue,
+                                                         gdouble *alpha);
+

+Initializes red, green, blue and alpha to represent the color specified +by self:

@@ -327,17 +368,65 @@ - -self : - +self : + a CcColor - -cr : - - +red : + target for red component + + + +green : + target for green component + + + +blue : + target for blue component + + + +alpha : + target for alpha value + + + +
+
+
+
+

+cc_color_stop ()

+
void                cc_color_stop                       (CcColor const *self,
+                                                         cairo_pattern_t *pattern,
+                                                         gdouble offset);
+

+Specify a color stop in pattern at offset with the color of self.

+

+

+
++ + + + + + + + + + + + @@ -345,15 +434,69 @@
-

Property Details

+

Property Details

-

+

The "alpha" property

-
  "alpha"                gdouble               : Read / Write / Construct
+
  "alpha"                    gdouble               : Read / Write / Construct

Alpha.

Allowed values: [0,1]

Default value: 1

+
+
+

+The "blue" property

+
  "blue"                     gdouble               : Read / Write / Construct
+

Blue.

+

Allowed values: [0,1]

+

Default value: 1

+
+
+
+

+The "green" property

+
  "green"                    gdouble               : Read / Write / Construct
+

Green.

+

Allowed values: [0,1]

+

Default value: 1

+
+
+
+

+The "red" property

+
  "red"                      gdouble               : Read / Write / Construct
+

Red.

+

Allowed values: [0,1]

+

Default value: 1

+
+
+
+

+The "hue" property

+
  "hue"                      gdouble               : Read / Write / Construct
+

Hue.

+

Allowed values: [0,1]

+

Default value: 0

+
+
+
+

+The "saturation" property

+
  "saturation"               gdouble               : Read / Write / Construct
+

Saturation.

+

Allowed values: [0,1]

+

Default value: 0

+
+
+
+

+The "value" property

+
  "value"                    gdouble               : Read / Write / Construct
+

Value.

+

Allowed values: [0,1]

+

Default value: 1

+
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc.devhelp /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc.devhelp --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc.devhelp 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc.devhelp 2007-05-05 23:29:45.000000000 +0100 @@ -3,33 +3,21 @@ - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + @@ -37,23 +25,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -64,13 +91,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78,8 +134,12 @@ + + + + @@ -88,12 +148,29 @@ + + + + + + + + + + + + + + + + + @@ -111,27 +188,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,6 +299,18 @@ + + + + + + + + + + + + @@ -150,5 +322,23 @@ + + + + + + + + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc.devhelp2 /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc.devhelp2 --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc.devhelp2 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc.devhelp2 2007-05-05 23:29:45.000000000 +0100 @@ -3,33 +3,21 @@ - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + @@ -37,23 +25,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -64,13 +91,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78,8 +134,12 @@ + + + + @@ -88,12 +148,29 @@ + + + + + + + + + + + + + + + + + @@ -111,27 +188,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,6 +299,18 @@ + + + + + + + + + + + + @@ -150,5 +322,23 @@ + + + + + + + + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Event-Handling.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Event-Handling.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Event-Handling.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Event-Handling.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Event Handling - + - + - + - + + - + + + + + + - - - - -
self : a CcColor +
pattern : a cairo_pattern_t +
offset : [0.0..1.0]
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Focus-Handling.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Focus-Handling.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Focus-Handling.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Focus-Handling.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Focus Handling - + - + - + - + + - + + + + + + - - - - - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Focus-Handling-The-focus-Signal.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Focus-Handling-The-focus-Signal.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Focus-Handling-The-focus-Signal.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Focus-Handling-The-focus-Signal.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ The focus signal - + - - + + - + + - + + + + + + - - - - - @@ -31,7 +32,7 @@ - +

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Fundamentals.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Fundamentals.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Fundamentals.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Fundamentals.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Fundamentals - + - + - + - + + - + + + + + + - - - - - @@ -38,19 +39,28 @@ Fundamentals
-Brushes - +Brushes +
+
+Color Brush +
+
+Colors +
+
+CcGradient
-Color Brush - +cc-linear-gradient
-Colors - +cc-radial-gradient
-Rectangle - +Rectangle
-Utilities - +Utilities
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Grid-Fitting.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Grid-Fitting.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Grid-Fitting.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Grid-Fitting.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,35 +3,36 @@ Grid-fitting - + - - - + + + - + + - + + + + + + - - - - - - + - +

@@ -47,14 +48,14 @@ CcRectangle class:

-

Figure 1. Rectangles rendered without grid-fitting

-
Rectangles rendered without grid-fitting
+

Figure 1. Rectangles rendered without grid-fitting

+
Rectangles rendered without grid-fitting
-
-

Figure 2. Rectangles rendered with grid-fitting

-
Rectangles rendered with grid-fitting
+
+

Figure 2. Rectangles rendered with grid-fitting

+
Rectangles rendered with grid-fitting
-

+

As you can see, grid-fitting can let your application look better if you're not completely in control of the item coordinates. Grid fitting works like this: if you know where a line should be displayed and how diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Hash-Map.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Hash-Map.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Hash-Map.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Hash-Map.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,275 @@ + + + + +CcHashMap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+
+
+ + +
+

+CcHashMap +

+

CcHashMap

+
+
+

Synopsis

+
+
+#include <ccc/cc-hash-map.h>
+
+
+                    CcHashMap;
+void                cc_hash_map_foreach                 (CcHashMap *self,
+                                                         GHFunc func,
+                                                         gpointer user_data);
+void                cc_hash_map_insert                  (CcHashMap *self,
+                                                         gpointer key,
+                                                         gpointer data);
+gpointer            cc_hash_map_lookup                  (CcHashMap *self,
+                                                         gconstpointer key);
+CcHashMap*          cc_hash_map_new                     (GType content_type);
+void                cc_hash_map_remove                  (CcHashMap *self,
+                                                         gconstpointer key);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----CcHashMap
+
+
+
+

Properties

+
+
+  "content"                  GType                 : Read / Write / Construct Only
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcHashMap

+
typedef struct _CcHashMap CcHashMap;
+

+A hash map object for CCC.

+

+ +

+
+
+
+

+cc_hash_map_foreach ()

+
void                cc_hash_map_foreach                 (CcHashMap *self,
+                                                         GHFunc func,
+                                                         gpointer user_data);
+

+Execute a function on each item from a CcHashMap.

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcHashMap +
func : a GHFunc +
user_data : user_data for func +
+
+
+
+

+cc_hash_map_insert ()

+
void                cc_hash_map_insert                  (CcHashMap *self,
+                                                         gpointer key,
+                                                         gpointer data);
+

+Inserts value into self (indexed by key).

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcHashMap +
key : the key that will be used for inserting +
data : the value to be inserted +
+
+
+
+

+cc_hash_map_lookup ()

+
gpointer            cc_hash_map_lookup                  (CcHashMap *self,
+                                                         gconstpointer key);
+

+Looks up the data for key.

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcHashMap +
key : a key +
Returns :the data belonging to key, NULL if no data was found. +
+
+
+
+

+cc_hash_map_new ()

+
CcHashMap*          cc_hash_map_new                     (GType content_type);
+

+Create a new CcHashMap that can hold items of the GType content_type.

+

+ +

+
++ + + + + + + + + + +
content_type : a GType for the content +
Returns :a new CcHashMap. +
+
+
+
+

+cc_hash_map_remove ()

+
void                cc_hash_map_remove                  (CcHashMap *self,
+                                                         gconstpointer key);
+

+Removes the data that was registered in self with the index key.

+

+ +

+
++ + + + + + + + + + +
self : a CcHashMap +
key : a key +
+
+
+
+

Property Details

+
+

+The "content" property

+
  "content"                  GType                 : Read / Write / Construct Only
+

The Type of the content.

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Internals.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Internals.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Internals.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Internals.html 2007-05-05 23:29:45.000000000 +0100 @@ -2,38 +2,39 @@ -Part II. Internals - +Part III. Internals + - + - + - + + - + + + + + + - - - - - - +

-Internals

+Part III. Internals

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Item-View.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Item-View.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Item-View.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Item-View.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,28 @@ Item View - + - + - + + - + + + + + + - - - - - @@ -34,47 +35,92 @@ - + Object Hierarchy +  |  + Prerequisites +  |  + Known Derived Interfaces +  |  + Known Implementations

-Item View +Item View

-

Item View —

+

Item View

Synopsis

-
+
+
+#include <ccc.h>
 
 
+                    CcItemView;
+                    CcItemViewIface;
+void                cc_item_view_register               (CcItemView *self,
+                                                         CcItem *item);
+void                cc_item_view_unregister             (CcItemView *self,
+                                                         CcItem *item);
 
-            CcItemViewIface;
-void        cc_item_view_register           (CcItemView *self,
-                                             CcItem *item);
-void        cc_item_view_unregister         (CcItemView *self,
-                                             CcItem *item);
+

+
+
+

Object Hierarchy

+
 
+  GInterface
+   +----CcItemView
-

Description

+

Prerequisites

+

+CcItemView requires + GObject.

+
+
+

Known Derived Interfaces

+

+CcItemView is required by + CcView.

+
+
+

Known Implementations

+

+CcItemView is implemented by + CcSimpleItem, CcCamera, CcText, CcShape, CcItem, CcViewCellRenderer, CcPixbuf, CcCaret, CcLine, CcRoundedRectangle, CcViewWidget, CcCircle and CcRectangle.

+
+
+

Description

-

Details

+

Details

-

+

+CcItemView

+
typedef struct _CcItemView CcItemView;
+

+ +

+
+
+
+

CcItemViewIface

-
typedef struct {
+
typedef struct {
 	GTypeInterface base_iface;
 
 	/* vtable */
@@ -102,10 +148,10 @@
-

+

cc_item_view_register ()

-
void        cc_item_view_register           (CcItemView *self,
-                                             CcItem *item);
+
void                cc_item_view_register               (CcItemView *self,
+                                                         CcItem *item);

@@ -113,14 +159,12 @@ - -self : +self : - -item : +item : @@ -131,10 +175,10 @@
-

+

cc_item_view_unregister ()

-
void        cc_item_view_unregister         (CcItemView *self,
-                                             CcItem *item);
+
void                cc_item_view_unregister             (CcItemView *self,
+                                                         CcItem *item);

@@ -142,14 +186,12 @@ - -self : +self : - -item : +item : diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Known-Bugs.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Known-Bugs.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Known-Bugs.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Known-Bugs.html 2007-05-05 23:29:45.000000000 +0100 @@ -3,27 +3,27 @@ Known Bugs - + - + - - + - + + - + + + + + + - - - - - @@ -31,7 +31,7 @@ - +

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-line.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-line.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-line.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-line.html 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,249 @@ + + + + +line + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+line +

+

line

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcLine;
+typedef             CcLineClass;
+void                cc_line_clear                       (CcLine *self);
+GType               cc_line_get_type                    (void);
+void                cc_line_line                        (CcLine *self,
+                                                         gdouble x,
+                                                         gdouble y);
+void                cc_line_move                        (CcLine *self,
+                                                         gdouble x,
+                                                         gdouble y);
+CcItem*             cc_line_new                         (void);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcShape
+                     +----CcLine
+                           +----CcCaret
+
+
+
+

Implemented Interfaces

+

+CcLine implements + CcItemView.

+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcLine

+
typedef CcShape      CcLine;
+
+

+ +

+
+
+
+

+CcLineClass

+
typedef CcShapeClass CcLineClass;
+
+

+ +

+
+
+
+

+cc_line_clear ()

+
void                cc_line_clear                       (CcLine *self);
+

+ +

+
++ + + + +
self : + + +
+
+
+
+

+cc_line_get_type ()

+
GType               cc_line_get_type                    (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_line_line ()

+
void                cc_line_line                        (CcLine *self,
+                                                         gdouble x,
+                                                         gdouble y);
+

+ +

+
++ + + + + + + + + + + + + + +
self : +
x : +
y : + + +
+
+
+
+

+cc_line_move ()

+
void                cc_line_move                        (CcLine *self,
+                                                         gdouble x,
+                                                         gdouble y);
+

+ +

+
++ + + + + + + + + + + + + + +
self : +
x : +
y : + + +
+
+
+
+

+cc_line_new ()

+
CcItem*             cc_line_new                         (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Object-Hierarchy.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Object-Hierarchy.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Object-Hierarchy.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Object-Hierarchy.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,27 +3,28 @@ Object Hierarchy - + - - + + - + - + + - + + + + + + - - - - - @@ -41,17 +42,35 @@ GInitiallyUnowned CcBrushCcBrushColor - CcColor + CcGradient + CcLinearGradient + CcRadialGradientCcItem - CcShape + CcCamera + CcShape + CcLine + CcCaret + CcCircleCcRectangle + CcRoundedRectangleCcText + CcPixbuf + CcSimpleItem + CcColor + CcColorHsv + CcColorRgb + CcPrinter GtkObject GtkCellRenderer CcViewCellRenderer GtkWidget GtkDrawingArea CcViewWidget + CcViewPNG + CcHashMap + GInterface + CcItemView + CcView diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-pixbuf.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-pixbuf.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-pixbuf.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-pixbuf.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,429 @@ + + + + +pixbuf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+pixbuf +

+

pixbuf

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcPixbuf;
+typedef             CcPixbufClass;
+gdouble             cc_pixbuf_get_rotation              (CcPixbuf const*self);
+GType               cc_pixbuf_get_type                  (void);
+CcItem*             cc_pixbuf_new                       (void);
+void                cc_pixbuf_set_pixbuf                (CcPixbuf *self,
+                                                         GdkPixbuf *pixbuf);
+void                cc_pixbuf_set_position              (CcPixbuf *self,
+                                                         gdouble x,
+                                                         gdouble y,
+                                                         gdouble w,
+                                                         gdouble h);
+void                cc_pixbuf_set_rotation              (CcPixbuf *self,
+                                                         gdouble rotation);
+void                cc_pixbuf_set_position_x            (CcPixbuf *self,
+                                                         gdouble pos_x);
+void                cc_pixbuf_set_position_y            (CcPixbuf *self,
+                                                         gdouble pos_y);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcPixbuf
+
+
+
+

Implemented Interfaces

+

+CcPixbuf implements + CcItemView.

+
+
+

Properties

+
+
+  "pixbuf"                   GdkPixbuf             : Read / Write
+  "position-h"               gdouble               : Read / Write
+  "position-h-set"           gboolean              : Read / Write
+  "position-w"               gdouble               : Read / Write
+  "position-w-set"           gboolean              : Read / Write
+  "position-x"               gdouble               : Read / Write
+  "position-y"               gdouble               : Read / Write
+  "rotation"                 gdouble               : Read / Write
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcPixbuf

+
typedef CcItem      CcPixbuf;
+
+

+ +

+
+
+
+

+CcPixbufClass

+
typedef CcItemClass CcPixbufClass;
+
+

+ +

+
+
+
+

+cc_pixbuf_get_rotation ()

+
gdouble             cc_pixbuf_get_rotation              (CcPixbuf const*self);
+

+ +

+
++ + + + + + + + + + +
self : +
Returns : + + +
+
+
+
+

+cc_pixbuf_get_type ()

+
GType               cc_pixbuf_get_type                  (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_pixbuf_new ()

+
CcItem*             cc_pixbuf_new                       (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_pixbuf_set_pixbuf ()

+
void                cc_pixbuf_set_pixbuf                (CcPixbuf *self,
+                                                         GdkPixbuf *pixbuf);
+

+ +

+
++ + + + + + + + + + +
self : +
pixbuf : + + +
+
+
+
+

+cc_pixbuf_set_position ()

+
void                cc_pixbuf_set_position              (CcPixbuf *self,
+                                                         gdouble x,
+                                                         gdouble y,
+                                                         gdouble w,
+                                                         gdouble h);
+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + +
self : +
x : +
y : +
w : +
h : + + +
+
+
+
+

+cc_pixbuf_set_rotation ()

+
void                cc_pixbuf_set_rotation              (CcPixbuf *self,
+                                                         gdouble rotation);
+

+ +

+
++ + + + + + + + + + +
self : +
rotation : + + +
+
+
+
+

+cc_pixbuf_set_position_x ()

+
void                cc_pixbuf_set_position_x            (CcPixbuf *self,
+                                                         gdouble pos_x);
+

+ +

+
++ + + + + + + + + + +
self : +
pos_x : + + +
+
+
+
+

+cc_pixbuf_set_position_y ()

+
void                cc_pixbuf_set_position_y            (CcPixbuf *self,
+                                                         gdouble pos_y);
+

+ +

+
++ + + + + + + + + + +
self : +
pos_y : + + +
+
+
+
+

Property Details

+
+

+The "pixbuf" property

+
  "pixbuf"                   GdkPixbuf             : Read / Write
+

pixbuf.

+
+
+
+

+The "position-h" property

+
  "position-h"               gdouble               : Read / Write
+

The height of the image.

+

Default value: 0

+
+
+
+

+The "position-h-set" property

+
  "position-h-set"           gboolean              : Read / Write
+

Use the specified height instead of the image height.

+

Default value: FALSE

+
+
+
+

+The "position-w" property

+
  "position-w"               gdouble               : Read / Write
+

The width of the image.

+

Default value: 0

+
+
+
+

+The "position-w-set" property

+
  "position-w-set"           gboolean              : Read / Write
+

Use the specified width instead of the image width.

+

Default value: FALSE

+
+
+
+

+The "position-x" property

+
  "position-x"               gdouble               : Read / Write
+

The horizontal position of the pixbuf.

+

Default value: 0

+
+
+
+

+The "position-y" property

+
  "position-y"               gdouble               : Read / Write
+

The vertical position of the pixbuf.

+

Default value: 0

+
+
+
+

+The "rotation" property

+
  "rotation"                 gdouble               : Read / Write
+

The rotation of this image.

+

Default value: 0

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-png-writer.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-png-writer.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-png-writer.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-png-writer.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,173 @@ + + + + +png-writer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+png-writer +

+

png-writer

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+                    CcViewPNG;
+                    CcViewPNGClass;
+GType               cc_view_png_get_type                (void);
+CcView*             cc_view_png_new                     (gchar const*filename);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcViewPNG
+
+
+
+

Properties

+
+
+  "filename"                 gchararray            : Read / Write / Construct Only
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcViewPNG

+
typedef struct _CcViewPNG CcViewPNG;
+

+ +

+
+
+
+

+CcViewPNGClass

+
typedef struct {
+	GInitiallyUnownedClass base_class;
+} CcViewPNGClass;
+
+

+ +

+
+
+
+

+cc_view_png_get_type ()

+
GType               cc_view_png_get_type                (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_view_png_new ()

+
CcView*             cc_view_png_new                     (gchar const*filename);
+

+ +

+
++ + + + + + + + + + +
filename : +
Returns : + + +
+
+
+
+

Property Details

+
+

+The "filename" property

+
  "filename"                 gchararray            : Read / Write / Construct Only
+

Filename.

+

Default value: NULL

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-printer.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-printer.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-printer.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-printer.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,193 @@ + + + + +printer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+printer +

+

printer

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+                    CcPrinter;
+                    CcPrinterClass;
+GType               cc_printer_get_type                 (void);
+CcPrinter*          cc_printer_new                      (gchar const*filename);
+void                cc_printer_print_page               (CcPrinter *self);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcPrinter
+
+
+
+

Properties

+
+
+  "filename"                 gchararray            : Read / Write
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcPrinter

+
typedef struct _CcPrinter CcPrinter;
+

+ +

+
+
+
+

+CcPrinterClass

+
typedef struct {
+	GInitiallyUnownedClass base_class;
+} CcPrinterClass;
+
+

+ +

+
+
+
+

+cc_printer_get_type ()

+
GType               cc_printer_get_type                 (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_printer_new ()

+
CcPrinter*          cc_printer_new                      (gchar const*filename);
+

+ +

+
++ + + + + + + + + + +
filename : +
Returns : + + +
+
+
+
+

+cc_printer_print_page ()

+
void                cc_printer_print_page               (CcPrinter *self);
+

+ +

+
++ + + + +
self : + + +
+
+
+
+

Property Details

+
+

+The "filename" property

+
  "filename"                 gchararray            : Read / Write
+

The name of the output file.

+

Default value: "output.pdf"

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Rapid-Prototyping-of-custom-Items.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Rapid-Prototyping-of-custom-Items.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Rapid-Prototyping-of-custom-Items.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Rapid-Prototyping-of-custom-Items.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,89 @@ + + + + +Rapid Prototyping of custom Items + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+Rapid Prototyping of custom Items

+
+
Managing the Bounding Box
+
Managing Redrawing
+
Hit-Testing
+
+
+

+Managing the Bounding Box

+

+ CCC uses a managed bounding box to easily see whether + a region that needs to be redrawn or whether a click + is within an item. So the first thing that you have to + care about is the question "where's my item?". +

+
static void
+update_bbox (CcItem  * item,
+	     CcView  * view,
+	     gpointer  user_data)
+{
+	CcDRect bounding_box = {0.0, 0.0, 100.0, 100.0};
+	CcDRect* old_box = cc_hash_map_lookup (item->bounds, view);
+
+	/* here you can add your routine to measure the bounding box and
+	 * update @bounding_box accordingly */
+
+	if (old_box && !cc_d_rect_equal (bounding_box, *old_box)) {
+		/* different bounding boxes; delete old one; bur before we do
+		 * let's ask for a redraw of the old area */
+		cc_item_dirty (item, view, *old_box);
+		g_free (old_box);
+		old_box = NULL;
+	}
+
+	if (!old_box) {
+		/* no bounding box set: copy ours */
+		cc_hash_map_insert (item->bounds, view, cc_d_rect_copy (&bounding_box));
+
+		/* queue the region to be redrawn */
+		cc_item_dirty (item, view, bounding_box);
+	}
+}
+
+…
+        g_signal_connect (custom_item, "update-bounds",
+                          G_CALLBACK (update_bbox), NULL);
+…
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Rectangle.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Rectangle.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Rectangle.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Rectangle.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,49 +3,50 @@ Rectangle - + - + - + - + + - + + + + + + - - - - - - + - + Description

-Rectangle +Rectangle

-

Rectangle —

+

Rectangle
@@ -53,32 +54,33 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcDRect;
-CcDRect*    cc_d_rect_copy                  (CcDRect *one);
-gboolean    cc_d_rect_equal                 (CcDRect one,
-                                             CcDRect two);
-gboolean    cc_d_rect_intersect             (CcDRect one,
-                                             CcDRect two);
-void        cc_d_rect_union                 (CcDRect one,
-                                             CcDRect two,
-                                             CcDRect *merged);
+                    CcDRect;
+CcDRect*            cc_d_rect_copy                      (CcDRect const*one);
+gboolean            cc_d_rect_equal                     (CcDRect one,
+                                                         CcDRect two);
+gboolean            cc_d_rect_intersect                 (CcDRect one,
+                                                         CcDRect two);
+void                cc_d_rect_union                     (CcDRect one,
+                                                         CcDRect two,
+                                                         CcDRect *merged);
-

Description

+

Description

-

Details

+

Details

-

+

CcDRect

-
typedef struct {
+
typedef struct {
 	gdouble x1;
 	gdouble y1;
 	gdouble x2;
@@ -91,9 +93,9 @@
-

+

cc_d_rect_copy ()

-
CcDRect*    cc_d_rect_copy                  (CcDRect *one);
+
CcDRect*            cc_d_rect_copy                      (CcDRect const*one);

@@ -101,14 +103,12 @@ - -one : +one : - -Returns : +Returns : @@ -119,10 +119,10 @@
-

+

cc_d_rect_equal ()

-
gboolean    cc_d_rect_equal                 (CcDRect one,
-                                             CcDRect two);
+
gboolean            cc_d_rect_equal                     (CcDRect one,
+                                                         CcDRect two);

@@ -130,20 +130,17 @@ - -one : +one : - -two : +two : - -Returns : +Returns : @@ -154,10 +151,10 @@
-

+

cc_d_rect_intersect ()

-
gboolean    cc_d_rect_intersect             (CcDRect one,
-                                             CcDRect two);
+
gboolean            cc_d_rect_intersect                 (CcDRect one,
+                                                         CcDRect two);

@@ -165,20 +162,17 @@ - -one : +one : - -two : +two : - -Returns : +Returns : @@ -189,11 +183,11 @@
-

+

cc_d_rect_union ()

-
void        cc_d_rect_union                 (CcDRect one,
-                                             CcDRect two,
-                                             CcDRect *merged);
+
void                cc_d_rect_union                     (CcDRect one,
+                                                         CcDRect two,
+                                                         CcDRect *merged);

@@ -201,20 +195,17 @@ - -one : +one : - -two : +two : - -merged : +merged : diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Rectangles.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Rectangles.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Rectangles.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Rectangles.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,55 +3,56 @@ Rectangles - + - - - + + + - + + - + + + + + + - - - - - - + - + - + Properties

-Rectangles +Rectangles

-

Rectangles —

+

Rectangles
@@ -59,67 +60,77 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcRectangle;
-            CcRectangleClass;
-CcItem*     cc_rectangle_new                (void);
-void        cc_rectangle_set_position       (CcRectangle *self,
-                                             gdouble x,
-                                             gdouble y,
-                                             gdouble w,
-                                             gdouble h);
+                    CcRectangle;
+                    CcRectangleClass;
+CcItem*             cc_rectangle_new                    (void);
+void                cc_rectangle_set_position           (CcRectangle *self,
+                                                         gdouble x,
+                                                         gdouble y,
+                                                         gdouble w,
+                                                         gdouble h);
+void                cc_rectangle_set_height             (CcRectangle *self,
+                                                         gdouble height);
+void                cc_rectangle_set_width              (CcRectangle *self,
+                                                         gdouble width);
+void                cc_rectangle_set_x                  (CcRectangle *self,
+                                                         gdouble x);
+void                cc_rectangle_set_y                  (CcRectangle *self,
+                                                         gdouble y);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
    +----GInitiallyUnowned
          +----CcItem
-               +----CcShape
+               +----CcShape
                      +----CcRectangle
+                           +----CcRoundedRectangle
-

Implemented Interfaces

+

Implemented Interfaces

CcRectangle implements -

+ CcItemView.

-

Properties

+

Properties

 
-  "position-h"           gdouble               : Read / Write
-  "position-w"           gdouble               : Read / Write
-  "position-x"           gdouble               : Read / Write
-  "position-y"           gdouble               : Read / Write
+  "position-h"               gdouble               : Read / Write
+  "position-w"               gdouble               : Read / Write
+  "position-x"               gdouble               : Read / Write
+  "position-y"               gdouble               : Read / Write
-

Description

+

Description

-

Details

+

Details

-

+

CcRectangle

-
typedef struct _CcRectangle CcRectangle;
+
typedef struct _CcRectangle CcRectangle;

-

+

CcRectangleClass

-
typedef struct {
+
typedef struct {
 	CcShapeClass base_class;
 } CcRectangleClass;
 

@@ -129,17 +140,16 @@
-

+

cc_rectangle_new ()

-
CcItem*     cc_rectangle_new                (void);
+
CcItem*             cc_rectangle_new                    (void);

- + - - + + + + + + + + + + + + + + + + + + +
-Returns :Returns : @@ -149,13 +159,15 @@
-

+

cc_rectangle_set_position ()

-
void        cc_rectangle_set_position       (CcRectangle *self,
-                                             gdouble x,
-                                             gdouble y,
-                                             gdouble w,
-                                             gdouble h);
+
void                cc_rectangle_set_position           (CcRectangle *self,
+                                                         gdouble x,
+                                                         gdouble y,
+                                                         gdouble w,
+                                                         gdouble h);
+

+Specify the position of a rectangle.

@@ -163,32 +175,133 @@
-self : +self : a CcRectangle +
x : the horizontal position +
y : the vertical position +
w : the width of the rectangle +
h : the eight of the rectangle
+
+
+
+

+cc_rectangle_set_height ()

+
void                cc_rectangle_set_height             (CcRectangle *self,
+                                                         gdouble height);
+

+ +

+
++ + + + + + + +
self : -x :
height : + +
+
+
+
+

+cc_rectangle_set_width ()

+
void                cc_rectangle_set_width              (CcRectangle *self,
+                                                         gdouble width);
+

+ +

+
++ + + + + + + +
self : -y :
width : + +
+
+
+
+

+cc_rectangle_set_x ()

+
void                cc_rectangle_set_x                  (CcRectangle *self,
+                                                         gdouble x);
+

+ +

+
++ + + + + + + +
self : -w :
x : + +
+
+
+
+

+cc_rectangle_set_y ()

+
void                cc_rectangle_set_y                  (CcRectangle *self,
+                                                         gdouble y);
+

+ +

+
++ + + + + + - + - + - - + - - + + + + + + + +
self : -h :
y : @@ -199,35 +312,35 @@
-

Property Details

+

Property Details

-

+

The "position-h" property

-
  "position-h"           gdouble               : Read / Write
+
  "position-h"               gdouble               : Read / Write

The height of the rectangle.

Default value: 0

-

+

The "position-w" property

-
  "position-w"           gdouble               : Read / Write
+
  "position-w"               gdouble               : Read / Write

The width of the rectangle.

Default value: 0

-

+

The "position-x" property

-
  "position-x"           gdouble               : Read / Write
+
  "position-x"               gdouble               : Read / Write

The x position of the rectangle.

Default value: 0

-

+

The "position-y" property

-
  "position-y"           gdouble               : Read / Write
+
  "position-y"               gdouble               : Read / Write

The y position of the rectangle.

Default value: 0

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Redrawing.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Redrawing.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Redrawing.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Redrawing.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,27 +3,28 @@ Redrawing - + - + - + + - + + + + + + - - - - - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Resolution-Independence.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Resolution-Independence.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Resolution-Independence.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Resolution-Independence.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,225 @@ + + + + +Resolution Independence + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+Resolution Independence +

+

Resolution Independence

+
+
+

Synopsis

+
+
+#include <ccc/cc-unit.h>
+
+
+                    CcDistance;
+enum                CcUnit;
+CcDistance*         cc_distance_new                     (gdouble value,
+                                                         CcUnit unit);
+CcDistance*         cc_distance_copy                    (CcDistance const*self);
+void                cc_distance_free                    (CcDistance *self);
+
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcDistance

+
typedef struct {
+} CcDistance;
+
+

+CcDistance represents a one-dimensional length measured in a certain unit. +You shouldn't access the attributes directly.

+

+ +

+
+
+
+

+enum CcUnit

+
typedef enum {
+	/* relative sizes */
+	CC_UNIT_DISPLAY_PIXEL,
+	/* EM */
+	/* EX */
+	/* CC_UNIT_PIXEL, */
+	/* GD */
+	/* REM */
+	/* VW */
+	/* VH */
+	/* VM */
+	/* CH */
+	/* absolute size */
+	/* IN */
+	/* CM */
+	/* MM */
+	CC_UNIT_POINT,
+	/* PC */
+	/* aliases */
+	/* CC_UNIT_PX = CC_UNIT_PIXEL, */
+	CC_UNIT_PT = CC_UNIT_POINT
+} CcUnit;
+
+

+CcUnit represents a length unit. It is used to represent sizes that are not +given in pixels. It's also very useful for resolution-independent rendering +of sizes and positions.

+

+ +

+
++ + + + + + + + + + + + + + +
CC_UNIT_DISPLAY_PIXEL +
CC_UNIT_POINT 1/72 of an inch +
CC_UNIT_PT an alias for CC_UNIT_POINT +
+
+
+
+

+cc_distance_new ()

+
CcDistance*         cc_distance_new                     (gdouble value,
+                                                         CcUnit unit);
+

+Create a new distance representation.

+

+ +

+
++ + + + + + + + + + + + + + +
value : the size +
unit : the unit belonging to the size +
Returns :a newly allocated CcDistance. +
+
+
+
+

+cc_distance_copy ()

+
CcDistance*         cc_distance_copy                    (CcDistance const*self);
+

+Create a new CcDistance by copying another.

+

+ +

+
++ + + + + + + + + + +
self : a CcDistance +
Returns :a copy of self. +
+
+
+
+

+cc_distance_free ()

+
void                cc_distance_free                    (CcDistance *self);
+

+Free the memory that was occupied by self.

+

+ +

+
++ + + + +
self : a CcDistance +
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-rounded-rectangle.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-rounded-rectangle.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-rounded-rectangle.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-rounded-rectangle.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,186 @@ + + + + +rounded-rectangle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+rounded-rectangle +

+

rounded-rectangle

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcRoundedRectangle;
+typedef             CcRoundedRectangleClass;
+CcItem*             cc_rounded_rectangle_new            (void);
+void                cc_rounded_rectangle_set_radius     (CcRoundedRectangle *self,
+                                                         gdouble radius);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcShape
+                     +----CcRectangle
+                           +----CcRoundedRectangle
+
+
+
+

Implemented Interfaces

+

+CcRoundedRectangle implements + CcItemView.

+
+
+

Properties

+
+
+  "corner-radius"            gdouble               : Read / Write
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcRoundedRectangle

+
typedef CcRectangle      CcRoundedRectangle;
+
+

+ +

+
+
+
+

+CcRoundedRectangleClass

+
typedef CcRectangleClass CcRoundedRectangleClass;
+
+

+ +

+
+
+
+

+cc_rounded_rectangle_new ()

+
CcItem*             cc_rounded_rectangle_new            (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_rounded_rectangle_set_radius ()

+
void                cc_rounded_rectangle_set_radius     (CcRoundedRectangle *self,
+                                                         gdouble radius);
+

+ +

+
++ + + + + + + + + + +
self : +
radius : + + +
+
+
+
+

Property Details

+
+

+The "corner-radius" property

+
  "corner-radius"            gdouble               : Read / Write
+

The radius used for the rounded corners.

+

Allowed values: >= 0

+

Default value: 5

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-shape.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-shape.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-shape.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-shape.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,388 @@ + + + + +shape + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+shape +

+

shape

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+                    CcShape;
+                    CcShapeClass;
+CcBrush*            cc_shape_get_brush_border           (CcShape *self);
+CcBrush*            cc_shape_get_brush_content          (CcShape *self);
+GType               cc_shape_get_type                   (void);
+gdouble             cc_shape_get_width                  (CcShape *shape,
+                                                         CcView const*view);
+void                cc_shape_set_brush_border           (CcShape *self,
+                                                         CcBrush *brush);
+void                cc_shape_set_brush_content          (CcShape *self,
+                                                         CcBrush *brush);
+void                cc_shape_set_width_pixels           (CcShape *self,
+                                                         gdouble width);
+void                cc_shape_set_width_units            (CcShape *self,
+                                                         gdouble width);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcShape
+                     +----CcLine
+                     +----CcCircle
+                     +----CcRectangle
+                     +----CcText
+
+
+
+

Implemented Interfaces

+

+CcShape implements + CcItemView.

+
+
+

Properties

+
+
+  "brush-border"             CcBrush               : Read / Write
+  "brush-content"            CcBrush               : Read / Write
+  "width"                    CcDistance            : Read / Write
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcShape

+
typedef struct _CcShape CcShape;
+

+ +

+
+
+
+

+CcShapeClass

+
typedef struct {
+	CcItemClass base_class;
+
+	void (*path)           (CcShape* self,
+				CcView * view,
+				cairo_t* cr);
+	void (*render_content) (CcShape* self,
+				CcView * view,
+				cairo_t* cr);
+	void (*render_border)  (CcShape* self,
+				CcView * view,
+				cairo_t* cr);
+} CcShapeClass;
+
+

+ +

+
+
+
+

+cc_shape_get_brush_border ()

+
CcBrush*            cc_shape_get_brush_border           (CcShape *self);
+

+ +

+
++ + + + + + + + + + +
self : +
Returns : + + +
+
+
+
+

+cc_shape_get_brush_content ()

+
CcBrush*            cc_shape_get_brush_content          (CcShape *self);
+

+ +

+
++ + + + + + + + + + +
self : +
Returns : + + +
+
+
+
+

+cc_shape_get_type ()

+
GType               cc_shape_get_type                   (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+

+cc_shape_get_width ()

+
gdouble             cc_shape_get_width                  (CcShape *shape,
+                                                         CcView const*view);
+

+ +

+
++ + + + + + + + + + + + + + +
shape : +
view : +
Returns : + + +
+
+
+
+

+cc_shape_set_brush_border ()

+
void                cc_shape_set_brush_border           (CcShape *self,
+                                                         CcBrush *brush);
+

+ +

+
++ + + + + + + + + + +
self : +
brush : + + +
+
+
+
+

+cc_shape_set_brush_content ()

+
void                cc_shape_set_brush_content          (CcShape *self,
+                                                         CcBrush *brush);
+

+ +

+
++ + + + + + + + + + +
self : +
brush : + + +
+
+
+
+

+cc_shape_set_width_pixels ()

+
void                cc_shape_set_width_pixels           (CcShape *self,
+                                                         gdouble width);
+

+ +

+
++ + + + + + + + + + +
self : +
width : + + +
+
+
+
+

+cc_shape_set_width_units ()

+
void                cc_shape_set_width_units            (CcShape *self,
+                                                         gdouble width);
+

+ +

+
++ + + + + + + + + + +
self : +
width : + + +
+
+
+
+

Property Details

+
+

+The "brush-border" property

+
  "brush-border"             CcBrush               : Read / Write
+

The brush for drawing the border.

+
+
+
+

+The "brush-content" property

+
  "brush-content"            CcBrush               : Read / Write
+

The brush for drawing the content.

+
+
+
+

+The "width" property

+
  "width"                    CcDistance            : Read / Write
+

The width of the outline.

+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Simple-Item.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Simple-Item.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Simple-Item.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Simple-Item.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,276 @@ + + + + +Simple Item + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

+Simple Item +

+

Simple Item

+
+
+

Synopsis

+
+
+#include <ccc/cc-simple-item.h>
+
+
+typedef             CcSimpleItem;
+typedef             CcSimpleItemClass;
+CcItem*             cc_simple_item_new                  (void);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcItem
+               +----CcSimpleItem
+
+
+
+

Implemented Interfaces

+

+CcSimpleItem implements + CcItemView.

+
+
+

Signals

+
+
+  "distance"                                       
+  "render"                                         
+  "update-bounds"                                  
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcSimpleItem

+
typedef CcItem      CcSimpleItem;
+
+

+ +

+
+
+
+

+CcSimpleItemClass

+
typedef CcItemClass CcSimpleItemClass;
+
+

+ +

+
+
+
+

+cc_simple_item_new ()

+
CcItem*             cc_simple_item_new                  (void);
+

+Creates a new item for rapid prototyping.

+

+ +

+
++ + + + +
Returns :a new CcItem. +
+
+
+
+

Signal Details

+
+

+The "distance" signal

+
gdouble             user_function                      (CcSimpleItem *self,
+                                                        CcView       *view,
+                                                        gdouble       x,
+                                                        gdouble       y,
+                                                        gpointer      retval,
+                                                        gpointer      user_data)
+

+Hit-Test an item. This signal gets emitted when the view is trying +to locate an item at a specific position. See also Rapid Prototyping of custom Items.

+

+ +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
self : the CcSimpleItem which received the signal +
view : the CcView where the signal was received +
x : the horizontal coordinate of the tested point +
y : the vertical coordinate of the tested point +
retval : a return location for a hit item +
user_data :user data set when the signal handler was connected.
Returns :the distance of (x, y) to self. +
+
+
+
+

+The "render" signal

+
void                user_function                      (CcSimpleItem *self,
+                                                        CcView       *view,
+                                                        CcCairo      *cairo,
+                                                        gpointer      user_data)
+

+Render the simple item to a view. See also Rapid Prototyping of custom Items.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +
self : a CcSimpleItem +
view : a CcView +
cairo : a cairo_t for rendering +
user_data :user data set when the signal handler was connected.
+
+
+
+

+The "update-bounds" signal

+
void                user_function                      (CcSimpleItem *self,
+                                                        CcView       *view,
+                                                        gpointer      user_data)
+

+Update the bounding box for a view. See also Rapid Prototyping of custom Items.

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcSimpleItem +
view : a CcView +
user_data :user data set when the signal handler was connected.
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Text.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Text.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Text.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Text.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,55 +3,56 @@ Text - + - - - + + + - + + - + + + + + + - - - - - - + - + - + Properties

-Text +Text

-

Text —

+

Text
@@ -59,72 +60,87 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcText;
-            CcTextClass;
-CcItem*     cc_text_new                     (gchar const *text);
-void        cc_text_set_anchor              (CcText *self,
-                                             gdouble x,
-                                             gdouble y);
-void        cc_text_set_anchor_type         (CcText *self,
-                                             GtkAnchorType anchor);
+                    CcText;
+                    CcTextClass;
+CcItem*             cc_text_new                         (gchar const *text);
+void                cc_text_set_anchor                  (CcText *self,
+                                                         gdouble x,
+                                                         gdouble y);
+void                cc_text_set_anchor_type             (CcText *self,
+                                                         GtkAnchorType anchor);
+gcharconst*         cc_text_get_text                    (CcText const *self);
+gboolean            cc_text_is_editable                 (CcText const *self);
+void                cc_text_set_editable                (CcText *self,
+                                                         gboolean editable);
+void                cc_text_set_font_description        (CcText *self,
+                                                         PangoFontDescription *desc);
+void                cc_text_set_markup                  (CcText *self,
+                                                         gchar const *markup);
+void                cc_text_set_size_pixels             (CcText *self,
+                                                         gboolean size_pixels);
+void                cc_text_set_text                    (CcText *self,
+                                                         gchar const *text);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
    +----GInitiallyUnowned
          +----CcItem
-               +----CcShape
+               +----CcShape
                      +----CcText
-

Implemented Interfaces

+

Implemented Interfaces

CcText implements -

+ CcItemView.

-

Properties

+

Properties

 
-  "anchor"               GtkAnchorType         : Read / Write / Construct
-  "cursor"               gint                  : 
-  "editable"             gboolean              : Read / Write
-  "size-pixels"          gboolean              : Read / Write
-  "text"                 gchararray            : Read / Write
+  "anchor"                   GtkAnchorType         : Read / Write / Construct
+  "attributes"               PangoAttrList         : Read / Write
+  "brush-caret"              CcBrush               : Read / Write
+  "cursor"                   gint                  : 
+  "editable"                 gboolean              : Read / Write
+  "size-pixels"              gboolean              : Read / Write
+  "text"                     gchararray            : Read / Write
-

Description

+

Description

-

Details

+

Details

-

+

CcText

-
typedef struct _CcText CcText;
+
typedef struct _CcText CcText;

-

+

CcTextClass

-
typedef struct {
+
typedef struct {
 	CcShapeClass base_class;
 
 	/* vtable */
-	void (*delete) (CcText     * self,
+	void (*remove) (CcText     * self,
 			guint        offset,
 			gsize        length);
 	void (*insert) (CcText     * self,
@@ -138,9 +154,9 @@
-

+

cc_text_new ()

-
CcItem*     cc_text_new                     (gchar const *text);
+
CcItem*             cc_text_new                         (gchar const *text);

@@ -148,14 +164,12 @@
-text :text :
-Returns :Returns : @@ -166,11 +180,13 @@
-

+

cc_text_set_anchor ()

-
void        cc_text_set_anchor              (CcText *self,
-                                             gdouble x,
-                                             gdouble y);
+
void                cc_text_set_anchor                  (CcText *self,
+                                                         gdouble x,
+                                                         gdouble y);
+

+Specify the location of the anchor point of the text item.

@@ -178,20 +194,70 @@
-self : +self : a CcText
-x : +x : the horizontal position of the anchor point +
y : the vertical position of the anchor point +
+
+
+
+

+cc_text_set_anchor_type ()

+
void                cc_text_set_anchor_type             (CcText *self,
+                                                         GtkAnchorType anchor);
+

+Set the anchor type of the text item. It specifies the location of the +anchor point relative to the text (so that north-west would become the +top-left corner).

+

+ +

+
++ + + + + + + + + +
self : a CcText +
anchor : the anchor type to be specified
+
+
+
+

+cc_text_get_text ()

+
gcharconst*         cc_text_get_text                    (CcText const *self);
+

+ +

+
++ + + + + + + + + + + + +
self : -y :
Returns : @@ -202,10 +268,9 @@
-

-cc_text_set_anchor_type ()

-
void        cc_text_set_anchor_type         (CcText *self,
-                                             GtkAnchorType anchor);
+

+cc_text_is_editable ()

+
gboolean            cc_text_is_editable                 (CcText const *self);

@@ -213,14 +278,39 @@
self : -self :
Returns : + +
+
+
+
+

+cc_text_set_editable ()

+
void                cc_text_set_editable                (CcText *self,
+                                                         gboolean editable);
+

+ +

+
++ + + + + +
self : -anchor :
editable : @@ -229,46 +319,169 @@
+
+
+

+cc_text_set_font_description ()

+
void                cc_text_set_font_description        (CcText *self,
+                                                         PangoFontDescription *desc);
+

+Sets the font description to be used for rendering.

+

+ +

+
++ + + + + + + + + + +
self : a CcText +
desc : a PangoFontDescription +
+
+
+
+

+cc_text_set_markup ()

+
void                cc_text_set_markup                  (CcText *self,
+                                                         gchar const *markup);
+

+Set the markup displayed by this item.

+

+ +

+
++ + + + + + + + + + +
self : a CcText +
markup : the markup to be set +
+
+
+
+

+cc_text_set_size_pixels ()

+
void                cc_text_set_size_pixels             (CcText *self,
+                                                         gboolean size_pixels);
+

+Specify whether the text size is given in pixels. If it is, the text won't +scale with the zoom level.

+

+ +

+
++ + + + + + + + + + +
self : a Cctext +
size_pixels : the value to be set +
+
+
+
+

+cc_text_set_text ()

+
void                cc_text_set_text                    (CcText *self,
+                                                         gchar const *text);
+

+Set the text to be displayed by a CcText item.

+

+ +

+
++ + + + + + + + + + +
self : a CcText +
text : the text to be set +
+
-

Property Details

+

Property Details

-

+

The "anchor" property

-
  "anchor"               GtkAnchorType         : Read / Write / Construct
+
  "anchor"                   GtkAnchorType         : Read / Write / Construct

The location of the anchor point of the text element.

Default value: GTK_ANCHOR_NORTH_WEST

-

+

+The "attributes" property

+
  "attributes"               PangoAttrList         : Read / Write
+

The PangoAttrList that specifies the .

+
+
+
+

+The "brush-caret" property

+
  "brush-caret"              CcBrush               : Read / Write
+

The brush used to paint the caret (text cursor).

+
+
+
+

The "cursor" property

-
  "cursor"               gint                  :
+
  "cursor"                   gint                  :

cursor.

Allowed values: [0,0]

Default value: 0

-

+

The "editable" property

-
  "editable"             gboolean              : Read / Write
+
  "editable"                 gboolean              : Read / Write

editable.

Default value: FALSE

-

+

The "size-pixels" property

-
  "size-pixels"          gboolean              : Read / Write
+
  "size-pixels"              gboolean              : Read / Write

Specifies whether the given size is in pixels or in canvas units.

Default value: FALSE

-

+

The "text" property

-
  "text"                 gchararray            : Read / Write
+
  "text"                     gchararray            : Read / Write

The displayed text.

Default value: NULL

diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-The-Base-Item.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-The-Base-Item.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-The-Base-Item.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-The-Base-Item.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,27 +3,28 @@ The Base Item - + - - + + - + + - + + + + + + - - - - - @@ -32,26 +33,26 @@ - + - + Signals

-The Base Item +The Base Item

-

The Base Item —

+

The Base Item
@@ -59,168 +60,151 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcItem;
-            CcItemClass;
-CcItem*     cc_item_new                     (void);
-void        cc_item_append                  (CcItem *self,
-                                             CcItem *child);
-void        cc_item_dirty                   (CcItem *self,
-                                             CcView const*view,
-                                             CcDRect dirty_region);
-gdouble     cc_item_distance                (CcItem *self,
-                                             gdouble x,
-                                             gdouble y,
-                                             CcItem **found);
-void        cc_item_insert                  (CcItem *self,
-                                             CcItem *child,
-                                             gint position);
-void        cc_item_remove                  (CcItem *self,
-                                             CcItem *child);
-void        cc_item_render                  (CcItem *self,
-                                             CcView *view,
-                                             CcItem;
+                    CcItemClass;
+void                cc_item_class_add_view_data         (gpointer item_class,
+                                                         gsize view_data_size);
+gpointer            cc_item_get_view_data               (CcItem const*self,
+                                                         CcView const*view,
+                                                         GType type);
+CcItem*             cc_item_new                         (void);
+void                cc_item_append                      (CcItem *self,
+                                                         CcItem *child);
+void                cc_item_dirty                       (CcItem *self,
+                                                         CcView const*view,
+                                                         CcDRect dirty_region);
+gdouble             cc_item_distance                    (CcItem *self,
+                                                         CcView const*view,
+                                                         gdouble x,
+                                                         gdouble y,
+                                                         CcItem **found);
+void                cc_item_insert                      (CcItem *self,
+                                                         CcItem *child,
+                                                         gint position);
+void                cc_item_remove                      (CcItem *self,
+                                                         CcItem *child);
+void                cc_item_render                      (CcItem *self,
+                                                         CcView *view,
+                                                         cairo_t *cr);
-void        cc_item_set_grid_aligned        (CcItem *self,
-                                             gboolean grid_aligned);
-enum        CcItemFlags;
-#define     CC_ITEM_FLAGS                   (i)
-#define     CC_ITEM_DISPOSED                (i)
-#define     CC_ITEM_GRID_ALIGNED            (i)
-#define     CC_ITEM_SET_FLAGS               (i,m)
-#define     CC_ITEM_UNSET_FLAGS             (i,m)
+void                cc_item_set_grid_aligned            (CcItem *self,
+                                                         gboolean grid_aligned);
+void                cc_item_lower                       (CcItem *child,
+                                                         CcItem *parent);
+void                cc_item_lower_to_bottom             (CcItem *child,
+                                                         CcItem *parent);
+void                cc_item_raise                       (CcItem *child,
+                                                         CcItem *parent);
+void                cc_item_raise_to_top                (CcItem *child,
+                                                         CcItem *parent);
+void                cc_item_set_position                (CcItem *child,
+                                                         CcItem *parent,
+                                                         gint position);
+enum                CcItemFlags;
+#define             CC_ITEM_FLAGS                       (i)
+#define             CC_ITEM_DISPOSED                    (i)
+#define             CC_ITEM_GRID_ALIGNED                (i)
+#define             CC_ITEM_SET_FLAGS                   (i,m)
+#define             CC_ITEM_UNSET_FLAGS                 (i,m)
+#define             CC_ITEM_CAN_FOCUS                   (i)
+void                (*CcItemFunc)                       (CcItem *item,
+                                                         CcView *view,
+                                                         gpointer data);
+void                cc_item_add_view                    (CcItem *self,
+                                                         CcView *view);
+void                cc_item_bounds_changed              (CcItem *self,
+                                                         CcView const*view);
+GType               cc_item_flags_get_type              (void);
+void                cc_item_foreach_view                (CcItem *self,
+                                                         CcItemFunc func,
+                                                         gpointer data);
+CcDRectconst*       cc_item_get_all_bounds              (CcItem const*self,
+                                                         CcView const*view);
+void                cc_item_grab_focus                  (CcItem *self,
+                                                         CcView *view);
+gboolean            cc_item_is_child_of                 (CcItem const*child,
+                                                         CcItem const*parent);
+void                cc_item_remove_view                 (CcItem *self,
+                                                         CcView *view);
+void                cc_item_update_bounds               (CcItem *self,
+                                                         gpointer data);
+void                cc_item_update_bounds_for_view      (CcItem *self,
+                                                         CcView *view);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
    +----GInitiallyUnowned
          +----CcItem
-               +----CcShape
+               +----CcCamera
+               +----CcShape
+               +----CcPixbuf
+               +----CcSimpleItem
-

Implemented Interfaces

+

Implemented Interfaces

CcItem implements -

+ CcItemView.

-

Signals

+

Signals

 
-"all-bounds-changed"
-            void        user_function      (CcItem  *ccitem,
-                                            CcView  *arg1,
-                                            CcDRect *arg2,
-                                            gpointer user_data)      : 
-"button-press-event"
-            gboolean    user_function      (CcItem         *self,
-                                            CcView         *view,
-                                            GdkEventButton *event,
-                                            gpointer        user_data)      : Run last
-"button-release-event"
-            gboolean    user_function      (CcItem         *self,
-                                            CcView         *view,
-                                            GdkEventButton *event,
-                                            gpointer        user_data)      : Run last
-"dirty"     void        user_function      (CcItem  *self,
-                                            CcView  *dirty_region,
-                                            CcDRect *arg2,
-                                            gpointer user_data)         : 
-"enter-notify-event"
-            gboolean    user_function      (CcItem           *self,
-                                            CcView           *view,
-                                            GdkEventCrossing *event,
-                                            gpointer          user_data)      : Run last
-"event"     gboolean    user_function      (CcItem   *self,
-                                            CcView   *view,
-                                            GdkEvent *event,
-                                            gpointer  user_data)      : Run last
-"focus"     gboolean    user_function      (CcItem           *self,
-                                            CcView           *view,
-                                            GtkDirectionType *dir,
-                                            gpointer          user_data)      : Run last
-"focus-enter"
-            gboolean    user_function      (CcItem   *ccitem,
-                                            CcView   *arg1,
-                                            GdkEvent *event,
-                                            gpointer  user_data)      : Run last
-"focus-leave"
-            gboolean    user_function      (CcItem   *ccitem,
-                                            CcView   *arg1,
-                                            GdkEvent *event,
-                                            gpointer  user_data)      : Run last
-"item-added"
-            void        user_function      (CcItem  *self,
-                                            gint     position,
-                                            CcItem  *child,
-                                            gpointer user_data)      : Run last
-"item-removed"
-            void        user_function      (CcItem  *self,
-                                            gint     position,
-                                            CcItem  *child,
-                                            gpointer user_data)      : Run last
-"key-press-event"
-            gboolean    user_function      (CcItem      *ccitem,
-                                            CcView      *arg1,
-                                            GdkEventKey *event,
-                                            gpointer     user_data)      : Run last
-"key-release-event"
-            gboolean    user_function      (CcItem      *ccitem,
-                                            CcView      *arg1,
-                                            GdkEventKey *event,
-                                            gpointer     user_data)      : Run last
-"leave-notify-event"
-            gboolean    user_function      (CcItem           *self,
-                                            CcView           *view,
-                                            GdkEventCrossing *event,
-                                            gpointer          user_data)      : Run last
-"motion-notify-event"
-            gboolean    user_function      (CcItem         *self,
-                                            CcView         *view,
-                                            GdkEventMotion *event,
-                                            gpointer        user_data)      : Run last
-"view-register"
-            void        user_function      (CcItem  *self,
-                                            CcView  *view,
-                                            gpointer user_data)      : Run first
-"view-unregister"
-            void        user_function      (CcItem  *self,
-                                            CcView  *view,
-                                            gpointer user_data)      : Run last
+  "all-bounds-changed"                             
+  "button-press-event"                             : Run Last
+  "button-release-event"                           : Run Last
+  "dirty"                                          
+  "enter-notify-event"                             : Run Last
+  "event"                                          : Run Last
+  "focus"                                          : Run Last
+  "focus-enter"                                    : Run Last
+  "focus-leave"                                    : Run Last
+  "item-added"                                     : Run Last
+  "item-removed"                                   : Run Last
+  "key-press-event"                                : Run Last
+  "key-release-event"                              : Run Last
+  "leave-notify-event"                             : Run Last
+  "motion-notify-event"                            : Run Last
+  "view-register"                                  : Run First
+  "view-unregister"                                : Run Last
-

Description

+

Description

-

Details

+

Details

-

+

CcItem

-
typedef struct _CcItem CcItem;
+
typedef struct _CcItem CcItem;

-

+

CcItemClass

-
typedef struct {
+
typedef struct {
 	GInitiallyUnownedClass base_class;
 
 	/* vtable */
 	gdouble (*distance)             (CcItem         * self,
+					 CcView const   * view,
 				         gdouble          x,
 				         gdouble          y,
 				         CcItem         **found);
@@ -289,9 +273,76 @@
-

+

+cc_item_class_add_view_data ()

+
void                cc_item_class_add_view_data         (gpointer item_class,
+                                                         gsize view_data_size);
+

+Registers the size of view data for a certain item class. See also +the section called “View-Specific Data”.

+

+ +

+
++ + + + + + + + + + +
item_class : a CcItemClass +
view_data_size : the size to be allocated for the view data +
+
+
+
+

+cc_item_get_view_data ()

+
gpointer            cc_item_get_view_data               (CcItem const*self,
+                                                         CcView const*view,
+                                                         GType type);
+

+Get a pointer to the view data for view in self. See also +the section called “View-Specific Data”.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +
self : a CcItem +
view : a CcView +
type : the GType of self which should be searched for the view +
Returns :a pointer to the requested memory. +
+
+
+
+

cc_item_new ()

-
CcItem*     cc_item_new                     (void);
+
CcItem*             cc_item_new                         (void);

Create a new CcItem that can be used to group several items together.

@@ -300,8 +351,7 @@

- + @@ -309,10 +359,10 @@
-

+

cc_item_append ()

-
void        cc_item_append                  (CcItem *self,
-                                             CcItem *child);
+
void                cc_item_append                      (CcItem *self,
+                                                         CcItem *child);

Insert an item at the end of this item. A CcItem can serve as a container for several items.

@@ -323,14 +373,12 @@
- + - + @@ -339,13 +387,13 @@
-

+

cc_item_dirty ()

-
void        cc_item_dirty                   (CcItem *self,
-                                             CcView const*view,
-                                             CcDRect dirty_region);
+
void                cc_item_dirty                       (CcItem *self,
+                                                         CcView const*view,
+                                                         CcDRect dirty_region);

-Let emit a signal to tell all the views that it needs to be redrawn.

+Let emit a signal to tell view that it needs to be redrawn.

@@ -353,20 +401,17 @@
- + - - + - + @@ -375,12 +420,13 @@
-

+

cc_item_distance ()

-
gdouble     cc_item_distance                (CcItem *self,
-                                             gdouble x,
-                                             gdouble y,
-                                             CcItem **found);
+
gdouble             cc_item_distance                    (CcItem *self,
+                                                         CcView const*view,
+                                                         gdouble x,
+                                                         gdouble y,
+                                                         CcItem **found);

Calculates the distance from self to (x,y). If (x,y) is within self or one of its children found is set to the matching element.

@@ -391,33 +437,510 @@
+ + + + + + + + + + + + + + + + + + + + + + + + +
-Returns :Returns : a new CcItem.
-self :self : a CcItem
-child :child : another CcItem
-self :self : a CcItem
-view : +view : a CcView
-dirty_region :dirty_region : the region that needs to be redrawn
self : a CcItem +
view : a CcView +
x : the x coordinate to query for +
y : the y coordinate to query for +
found : the return location for a found CcItem +
Returns :the distance between self (or one of its children) to (x,y). +
+
+
+
+

+cc_item_insert ()

+
void                cc_item_insert                      (CcItem *self,
+                                                         CcItem *child,
+                                                         gint position);
+

+Inserts child at position into self.

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcItem +
child : another CcItem +
position : the position to insert the child at (0 means at the bottom, +bigger numbers mean higher layers, -1 means top layer) +
+
+
+
+

+cc_item_remove ()

+
void                cc_item_remove                      (CcItem *self,
+                                                         CcItem *child);
+

+Removes child from self. Does nothing if child was not a child of self +or if child is a child of one of self's children.

+

+ +

+
++ + + + + + + + + + +
self : a CcItem +
child : another CcItem +
+
+
+
+

+cc_item_render ()

+
void                cc_item_render                      (CcItem *self,
+                                                         CcView *view,
+                                                         cairo_t *cr);
+

+Renders self to cr which is supposed to be a cairo context of view as +the transformation matrix of view will be used for rendering.

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcItem +
view : a Ccview +
cr : a cairo context (cairo_t) +
+
+
+
+

+cc_item_set_grid_aligned ()

+
void                cc_item_set_grid_aligned            (CcItem *self,
+                                                         gboolean grid_aligned);
+

+Sets self to be rendered grid-aligned if grid_aligned is TRUE, sets it to +be allowed to render fuzzyly if FALSE.

+

+ +

+
++ + + + + + + + + + +
self : a CcItem +
grid_aligned : a gboolean +
+
+
+
+

+cc_item_lower ()

+
void                cc_item_lower                       (CcItem *child,
+                                                         CcItem *parent);
+

+Lowers child by one level.

+

+ +

+
++ + + + + + + + + + +
child : a CcItem +
parent : another CcItem, parent of child +
+
+
+
+

+cc_item_lower_to_bottom ()

+
void                cc_item_lower_to_bottom             (CcItem *child,
+                                                         CcItem *parent);
+

+Lowers child to be displayed behind all the other children of parent.

+

+ +

+
++ + + + + + + + + + +
child : a CcItem +
parent : another CcItem, parent of child +
+
+
+
+

+cc_item_raise ()

+
void                cc_item_raise                       (CcItem *child,
+                                                         CcItem *parent);
+

+Raises child by one level.

+

+ +

+
++ + + + + + + + + + +
child : a CcItem +
parent : another CcItem, parent of child +
+
+
+
+

+cc_item_raise_to_top ()

+
void                cc_item_raise_to_top                (CcItem *child,
+                                                         CcItem *parent);
+

+Raises an child to the top. It will be displayed over all of the other +children of parent.

+

+ +

+
++ + + + + + + + + + +
child : a CcItem +
parent : another CcItem, parent of child +
+
+
+
+

+cc_item_set_position ()

+
void                cc_item_set_position                (CcItem *child,
+                                                         CcItem *parent,
+                                                         gint position);
+

+Changes the position of child relative to parent.

+

+ +

+
++ + + + + + + + + + + + + + +
child : a CcItem +
parent : another CcItem, parent of child +
position : the new position of the CcItem (0 means at the bottom, +bigger numbers mean higher layers, -1 means top layer) +
+
+
+
+

+enum CcItemFlags

+
typedef enum {
+	CC_CAN_FOCUS          = 1 << 1,
+	CC_DISPOSED           = 1 << 2,
+	CC_GRID_ALIGNED       = 1 << 3,
+} CcItemFlags;
+
+

+

+

+ +

+
++ + + + + + + + + + + + + + +
CC_CAN_FOCUS +
CC_DISPOSED specifies whether dispose has already been run on an item. +
CC_GRID_ALIGNED specifies whether an item should be rendered to match an +existing grid. +
+
+
+
+

+CC_ITEM_FLAGS()

+
#define CC_ITEM_FLAGS(i)         (CC_ITEM(i)->flags)
+
+

+Get the flags which are set on the CcItem i.

+

+ +

+
++ + + + +
i : a CcItem +
+
+
+
+

+CC_ITEM_DISPOSED()

+
#define CC_ITEM_DISPOSED(i)           ((CC_ITEM_FLAGS(i) & CC_DISPOSED) != 0)
+
+

+Queries the CcItem i whether it has the CC_DISPOSED flag set. This is +very useful in the dispose handler for the GObject derived types. This flag +gets set automatically if you chain up your dispose calls correctly.

+

+ +

+
++ + + + +
i : a CcItem +
+
+
+
+

+CC_ITEM_GRID_ALIGNED()

+
#define CC_ITEM_GRID_ALIGNED(i)       ((CC_ITEM_FLAGS(i) & CC_GRID_ALIGNED) != 0)
+
+

+Queries the CcItem i whether it has the CC_GRID_ALIGNED flag set.

+

+ +

+
++ + + + +
i : a CcItem +
+
+
+
+

+CC_ITEM_SET_FLAGS()

+
#define CC_ITEM_SET_FLAGS(i,m)   G_STMT_START{ (CC_ITEM_FLAGS(i) |=  (m)); }G_STMT_END
+
+

+Sets on i the CcItemFlags that have been specified in m.

+

+ +

+
++ + + + + + + + + + +
i : a CcItem +
m : a CcItemFlags mask +
+
+
+
+

+CC_ITEM_UNSET_FLAGS()

+
#define CC_ITEM_UNSET_FLAGS(i,m) G_STMT_START{ (CC_ITEM_FLAGS(i) &= ~(m)); }G_STMT_END
+
+

+Unsets from i the CcItemFlags that have been specified in m.

+

+ +

+
++ + + + + + + + + + +
i : a CcItem +
m : a CcItemFlags mask +
+
+
+
+

+CC_ITEM_CAN_FOCUS()

+
#define CC_ITEM_CAN_FOCUS(i)          ((CC_ITEM_FLAGS(i) & CC_CAN_FOCUS) != 0)
+
+

+ +

+
++ + + + +
i : + + +
+
+
+
+

+CcItemFunc ()

+
void                (*CcItemFunc)                       (CcItem *item,
+                                                         CcView *view,
+                                                         gpointer data);
+

+ +

+
++ + + - - - - - - - - - + - + - @@ -425,13 +948,17 @@
-

-cc_item_insert ()

-
void        cc_item_insert                  (CcItem *self,
-                                             CcItem *child,
-                                             gint position);
+

+cc_item_add_view ()

+
void                cc_item_add_view                    (CcItem *self,
+                                                         CcView *view);

-Inserts child at position into self.

+Registers a view at the item. The item and its children can now set up data +for this view. +

+

+This function should not be called by application code. Use +cc_item_view_register() instead.

@@ -439,22 +966,13 @@
- + - - - - - - + @@ -462,13 +980,10 @@
-

-cc_item_remove ()

-
void        cc_item_remove                  (CcItem *self,
-                                             CcItem *child);
-

-Removes child from self. Does nothing if child was not a child of self -or if child is a child of one of self's children.

+

+cc_item_bounds_changed ()

+
void                cc_item_bounds_changed              (CcItem *self,
+                                                         CcView const*view);

@@ -476,15 +991,15 @@
+ - + - @@ -492,16 +1007,30 @@
-

-cc_item_render ()

-
void        cc_item_render                  (CcItem *self,
-                                             CcView *view,
-                                             cairo_t *cr);
+

+cc_item_flags_get_type ()

+
GType               cc_item_flags_get_type              (void);

-Renders self to cr which is supposed to be a cairo context of view as -the transformation matrix of view will be used for rendering.

+ +

+
item : -self : a CcItem -
-x : the x coordinate to query for -
-y : the y coordinate to query for
view : -found : the return location for a found CcItem
data : -Returns :the distance between self (or one of its children) to (x,y). + +
-self :self : a CcItem
-child : another CcItem -
-position : the position to insert the child at (0 means at the bottom, -bigger numbers mean higher layers, -1 means top layer) +view : a CcView
self : -self : a CcItem
view : -child : another CcItem + +
++ + + + +
Returns : + + +
+
+
+
+

+cc_item_foreach_view ()

+
void                cc_item_foreach_view                (CcItem *self,
+                                                         CcItemFunc func,
+                                                         gpointer data);

@@ -509,23 +1038,20 @@ +self : -self : - a CcItem +func : -view : - a Ccview +data : -cr : - a cairo context (cairo_t) + + @@ -533,13 +1059,12 @@
-

-cc_item_set_grid_aligned ()

-
void        cc_item_set_grid_aligned        (CcItem *self,
-                                             gboolean grid_aligned);
+

+cc_item_get_all_bounds ()

+
CcDRectconst*       cc_item_get_all_bounds              (CcItem const*self,
+                                                         CcView const*view);

-Sets self to be rendered grid-aligned if grid_aligned is TRUE, sets it to -be allowed to render fuzzyly if FALSE.

+Get the bounds of self as it would e displayed by view (including all of its children).

@@ -547,15 +1072,19 @@ - -self : +self : a CcItem - -grid_aligned : - a gboolean +view : + a CcView + + + +Returns : +the bounds of the item, may be NULL (in this case the item is not +tied visible area). @@ -563,16 +1092,10 @@
-

-enum CcItemFlags

-
typedef enum {
-	CC_CAN_FOCUS          = 1 << 1,
-	CC_DISPOSED           = 1 << 2,
-	CC_GRID_ALIGNED       = 1 << 3,
-} CcItemFlags;
-
-

-

+

+cc_item_grab_focus ()

+
void                cc_item_grab_focus                  (CcItem *self,
+                                                         CcView *view);

@@ -580,22 +1103,15 @@ +self : -CC_CAN_FOCUS - - - - - -CC_DISPOSED - specifies whether dispose has already been run on an item. +view : -CC_GRID_ALIGNED - specifies whether an item should be rendered to match an -existing grid. + + @@ -603,77 +1119,75 @@
-

-CC_ITEM_FLAGS()

-
#define CC_ITEM_FLAGS(i)         (CC_ITEM(i)->flags)
-
+

+cc_item_is_child_of ()

+
gboolean            cc_item_is_child_of                 (CcItem const*child,
+                                                         CcItem const*parent);

-Get the flags which are set on the CcItem i.

+Find out whether child is a child of parent.

- - + + + - -
-i :
child : a CcItem
-
-
-
-

-CC_ITEM_DISPOSED()

-
#define CC_ITEM_DISPOSED(i)           ((CC_ITEM_FLAGS(i) & CC_DISPOSED) != 0)
-
-

-Queries the CcItem i whether it has the CC_DISPOSED flag set. This is -very useful in the dispose handler for the GObject derived types. This flag -gets set automatically if you chain up your dispose calls correctly.

-

- -

-
-- + + + + + + + - - + +
parent : another CcItem +
Returns : -i : a CcItem +TRUE is child is a child of parent.
-

-CC_ITEM_GRID_ALIGNED()

-
#define CC_ITEM_GRID_ALIGNED(i)       ((CC_ITEM_FLAGS(i) & CC_GRID_ALIGNED) != 0)
-
+

+cc_item_remove_view ()

+
void                cc_item_remove_view                 (CcItem *self,
+                                                         CcView *view);

-Queries the CcItem i whether it has the CC_GRID_ALIGNED flag set.

+Unregisters a view at the item. The item and the children can now free data +kept for this view. +

+

+This function should not be called by application code. Use +cc_item_view_unregister() instead.

- - + + + - + + + + + +
-i :
self : a CcItem
view : a CcView +
-

-CC_ITEM_SET_FLAGS()

-
#define CC_ITEM_SET_FLAGS(i,m)   G_STMT_START{ (CC_ITEM_FLAGS(i) |=  (m)); }G_STMT_END
-
-

-Sets on i the CcItemFlags that have been specified in m.

+

+cc_item_update_bounds ()

+
void                cc_item_update_bounds               (CcItem *self,
+                                                         gpointer data);

@@ -681,15 +1195,15 @@ +self : -i : - a CcItem +data : -m : - a CcItemFlags mask + + @@ -697,12 +1211,10 @@
-

-CC_ITEM_UNSET_FLAGS()

-
#define CC_ITEM_UNSET_FLAGS(i,m) G_STMT_START{ (CC_ITEM_FLAGS(i) &= ~(m)); }G_STMT_END
-
-

-Unsets from i the CcItemFlags that have been specified in m.

+

+cc_item_update_bounds_for_view ()

+
void                cc_item_update_bounds_for_view      (CcItem *self,
+                                                         CcView *view);

@@ -710,15 +1222,15 @@ +self : -i : - a CcItem +view : -m : - a CcItemFlags mask + + @@ -726,14 +1238,17 @@
-

Signal Details

+

Signal Details

-

+

The "all-bounds-changed" signal

-
void        user_function                  (CcItem  *ccitem,
-                                            CcView  *arg1,
-                                            CcDRect *arg2,
-                                            gpointer user_data)      :
+
void                user_function                      (CcItem  *self,
+                                                        CcView  *view,
+                                                        CcDRect *box,
+                                                        gpointer user_data)
+

+This signal gets emitted when the total bounding box of an item +changed. See also Bounds Handling.

@@ -741,27 +1256,22 @@ - -ccitem : -the object which received the signal. +self : + a Ccitem - -arg1 : - +view : + the CcView belonging to this event - -arg2 : - - +box : + a CcDRect specifying the new bounding box - -user_data : +user_data : user data set when the signal handler was connected. @@ -769,12 +1279,12 @@
-

+

The "button-press-event" signal

-
gboolean    user_function                  (CcItem         *self,
-                                            CcView         *view,
-                                            GdkEventButton *event,
-                                            gpointer        user_data)      : Run last
+
gboolean            user_function                      (CcItem         *self,
+                                                        CcView         *view,
+                                                        GdkEventButton *event,
+                                                        gpointer        user_data)      : Run Last

This signal gets emitted when a mouse button got pressed on top of an element.

@@ -785,32 +1295,27 @@ - -self : +self : a CcItem - -view : - the CcView which emitted this event +view : + the CcView which emitted this event - -event : +event : a GdkEventButton with coordinates translated to canvas coordinates. - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being called. @@ -820,12 +1325,12 @@
-

+

The "button-release-event" signal

-
gboolean    user_function                  (CcItem         *self,
-                                            CcView         *view,
-                                            GdkEventButton *event,
-                                            gpointer        user_data)      : Run last
+
gboolean            user_function                      (CcItem         *self,
+                                                        CcView         *view,
+                                                        GdkEventButton *event,
+                                                        gpointer        user_data)      : Run Last

This signal gets emitted when a mouse button got released on top of an item.

@@ -836,32 +1341,27 @@ - -self : +self : a CcItem - -view : - the CcView which emitted this event +view : + the CcView which emitted this event - -event : +event : a GdkEventButton with coordinates translated to canvas coordinates - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being called. @@ -871,12 +1371,12 @@
-

+

The "dirty" signal

-
void        user_function                  (CcItem  *self,
-                                            CcView  *dirty_region,
-                                            CcDRect *arg2,
-                                            gpointer user_data)         :
+
void                user_function                      (CcItem  *self,
+                                                        CcView  *dirty_region,
+                                                        CcDRect *arg2,
+                                                        gpointer user_data)

This signal gets emitted when an item changes. It's used to request redraws of the affected items.

@@ -887,20 +1387,17 @@ - -self : +self : a CcItem - -dirty_region : +dirty_region : a CcDRect that specifies the dirty region - -user_data : +user_data : user data set when the signal handler was connected. @@ -908,12 +1405,12 @@
-

+

The "enter-notify-event" signal

-
gboolean    user_function                  (CcItem           *self,
-                                            CcView           *view,
-                                            GdkEventCrossing *event,
-                                            gpointer          user_data)      : Run last
+
gboolean            user_function                      (CcItem           *self,
+                                                        CcView           *view,
+                                                        GdkEventCrossing *event,
+                                                        gpointer          user_data)      : Run Last

This signal gets emitted when the mouse pointer enters an item.

@@ -923,32 +1420,27 @@ - -self : +self : a CcItem - -view : - the CcView which emitted this event +view : + the CcView which emitted this event - -event : +event : a GdkEventCrossing with x and y coordinates translated into canvas coordinates - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being invoked. @@ -958,12 +1450,12 @@

-

+

The "event" signal

-
gboolean    user_function                  (CcItem   *self,
-                                            CcView   *view,
-                                            GdkEvent *event,
-                                            gpointer  user_data)      : Run last
+
gboolean            user_function                      (CcItem   *self,
+                                                        CcView   *view,
+                                                        GdkEvent *event,
+                                                        gpointer  user_data)      : Run Last

This signal catches all events before they are distributes into more specified signals.

@@ -974,31 +1466,26 @@ - -self : +self : a CcItem - -view : - the CcView which emitted this event +view : + the CcView which emitted this event - -event : +event : the event that got emitted (with canvas coordinates) - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being called. @@ -1008,12 +1495,12 @@
-

+

The "focus" signal

-
gboolean    user_function                  (CcItem           *self,
-                                            CcView           *view,
-                                            GtkDirectionType *dir,
-                                            gpointer          user_data)      : Run last
+
gboolean            user_function                      (CcItem          *self,
+                                                        CcView          *view,
+                                                        GtkDirectionType dir,
+                                                        gpointer         user_data)      : Run Last

This signal gets emitted when a focus event on the view happended to let focus-handling happen.

@@ -1024,31 +1511,26 @@ - -self : +self : a CcItem - -view : - a CcView +view : + a CcView - -dir : +dir : the focus direction - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being called (such as the one which lets the focus leave the canvas view) @@ -1059,12 +1541,14 @@
-

+

The "focus-enter" signal

-
gboolean    user_function                  (CcItem   *ccitem,
-                                            CcView   *arg1,
-                                            GdkEvent *event,
-                                            gpointer  user_data)      : Run last
+
gboolean            user_function                      (CcItem   *self,
+                                                        CcView   *view,
+                                                        GdkEvent *event,
+                                                        gpointer  user_data)      : Run Last
+

+This signal gets emitted when the focus enters this item.

@@ -1072,33 +1556,29 @@ - -ccitem : -the object which received the signal. +self : + a CcItem - -arg1 : - +view : + a CcView - -event : - +event : + a GdkEventFocus - -user_data : +user_data : user data set when the signal handler was connected. +Returns : -Returns : - - +TRUE to stop other signal handlers, FALSE to allow their +execution. @@ -1106,12 +1586,14 @@
-

+

The "focus-leave" signal

-
gboolean    user_function                  (CcItem   *ccitem,
-                                            CcView   *arg1,
-                                            GdkEvent *event,
-                                            gpointer  user_data)      : Run last
+
gboolean            user_function                      (CcItem   *self,
+                                                        CcView   *view,
+                                                        GdkEvent *event,
+                                                        gpointer  user_data)      : Run Last
+

+This signal gets emitted when the focus leaves this item.

@@ -1119,33 +1601,29 @@ - -ccitem : -the object which received the signal. +self : + a CcItem - -arg1 : - +view : + a CcView - -event : - +event : + a GdkEventFocus - -user_data : +user_data : user data set when the signal handler was connected. +Returns : -Returns : - - +TRUE to stop other signal handlers, FALSE to allow their +execution. @@ -1153,12 +1631,12 @@
-

+

The "item-added" signal

-
void        user_function                  (CcItem  *self,
-                                            gint     position,
-                                            CcItem  *child,
-                                            gpointer user_data)      : Run last
+
void                user_function                      (CcItem  *self,
+                                                        gint     position,
+                                                        CcItem  *child,
+                                                        gpointer user_data)      : Run Last

This signal gets emitted when an element is added to another element.

@@ -1168,26 +1646,22 @@ - -self : +self : a CcItem - -position : +position : the new index of the child - -child : +child : the child - -user_data : +user_data : user data set when the signal handler was connected. @@ -1195,12 +1669,12 @@

-

+

The "item-removed" signal

-
void        user_function                  (CcItem  *self,
-                                            gint     position,
-                                            CcItem  *child,
-                                            gpointer user_data)      : Run last
+
void                user_function                      (CcItem  *self,
+                                                        gint     position,
+                                                        CcItem  *child,
+                                                        gpointer user_data)      : Run Last

This signal gets emitted when an element is removed from another element.

@@ -1210,26 +1684,22 @@ - -self : +self : a CcItem - -position : +position : the former index of the child - -child : +child : the child - -user_data : +user_data : user data set when the signal handler was connected. @@ -1237,12 +1707,14 @@

-

+

The "key-press-event" signal

-
gboolean    user_function                  (CcItem      *ccitem,
-                                            CcView      *arg1,
-                                            GdkEventKey *event,
-                                            gpointer     user_data)      : Run last
+
gboolean            user_function                      (CcItem      *self,
+                                                        CcView      *view,
+                                                        GdkEventKey *event,
+                                                        gpointer     user_data)      : Run Last
+

+This signal gets emitted when a key gets pressed.

@@ -1250,33 +1722,29 @@ - -ccitem : -the object which received the signal. +self : + a CcItem - -arg1 : - +view : + a CcView - -event : - +event : + a GdkEventKey - -user_data : +user_data : user data set when the signal handler was connected. +Returns : -Returns : - - +TRUE to stop other signal handlers, FALSE to allow their +execution. @@ -1284,12 +1752,14 @@
-

+

The "key-release-event" signal

-
gboolean    user_function                  (CcItem      *ccitem,
-                                            CcView      *arg1,
-                                            GdkEventKey *event,
-                                            gpointer     user_data)      : Run last
+
gboolean            user_function                      (CcItem      *self,
+                                                        CcView      *view,
+                                                        GdkEventKey *event,
+                                                        gpointer     user_data)      : Run Last
+

+This signal gets emitted when a key gets released.

@@ -1297,33 +1767,29 @@ - -ccitem : -the object which received the signal. +self : + a CcItem - -arg1 : - +view : + a CcView - -event : - +event : + a GdkEventKey - -user_data : +user_data : user data set when the signal handler was connected. +Returns : -Returns : - - +TRUE to stop other signal handlers, FALSE to allow their +execution. @@ -1331,12 +1797,12 @@
-

+

The "leave-notify-event" signal

-
gboolean    user_function                  (CcItem           *self,
-                                            CcView           *view,
-                                            GdkEventCrossing *event,
-                                            gpointer          user_data)      : Run last
+
gboolean            user_function                      (CcItem           *self,
+                                                        CcView           *view,
+                                                        GdkEventCrossing *event,
+                                                        gpointer          user_data)      : Run Last

This signal gets emitted when the mouse pointer leaves an element.

@@ -1346,31 +1812,26 @@ - -self : +self : a CcItem - -view : - the CcView which emitted this event +view : + the CcView which emitted this event - -event : +event : a GdkEventCrossing - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being invoked. @@ -1380,12 +1841,12 @@

-

+

The "motion-notify-event" signal

-
gboolean    user_function                  (CcItem         *self,
-                                            CcView         *view,
-                                            GdkEventMotion *event,
-                                            gpointer        user_data)      : Run last
+
gboolean            user_function                      (CcItem         *self,
+                                                        CcView         *view,
+                                                        GdkEventMotion *event,
+                                                        gpointer        user_data)      : Run Last

This signal gets emitted when the pointer (mouse cursor) moves while being over this item.

@@ -1396,31 +1857,26 @@ - -self : +self : a CcItem - -view : - the CcView which emitted this event +view : + the CcView which emitted this event - -event : +event : the event that got emitted (with canvas coordinates) - -user_data : +user_data : user data set when the signal handler was connected. - -Returns : +Returns : TRUE to stop other signal handlers from being called. @@ -1430,11 +1886,11 @@
-

+

The "view-register" signal

-
void        user_function                  (CcItem  *self,
-                                            CcView  *view,
-                                            gpointer user_data)      : Run first
+
void                user_function                      (CcItem  *self,
+                                                        CcView  *view,
+                                                        gpointer user_data)      : Run First

Registeres the view for this item. This signal can be used to create view-specific data for the CcItem. Take a look at CcText to see @@ -1446,20 +1902,17 @@ - -self : +self : a CcItem - -view : - a CcView +view : + a CcView - -user_data : +user_data : user data set when the signal handler was connected. @@ -1467,11 +1920,11 @@

-

+

The "view-unregister" signal

-
void        user_function                  (CcItem  *self,
-                                            CcView  *view,
-                                            gpointer user_data)      : Run last
+
void                user_function                      (CcItem  *self,
+                                                        CcView  *view,
+                                                        gpointer user_data)      : Run Last

Registeres the view for this item. This signal can be used to create view-specific data for the CcItem. Take a look at CcText to see @@ -1483,20 +1936,17 @@ - -self : +self : a CcItem - -view : - a CcView +view : + a CcView - -user_data : +user_data : user data set when the signal handler was connected. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Utilities.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Utilities.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Utilities.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Utilities.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,27 +3,28 @@ Utilities - + - + - + + - + + + + + + - - - - - @@ -34,18 +35,18 @@ - + Description

-Utilities +Utilities

-

Utilities —

+

Utilities
@@ -53,33 +54,36 @@

Synopsis

 
+#include <ccc.h>
 
 
-gboolean    cc_accumulator_boolean          (GSignalInvocationHint *hint,
-                                             GValue *return_accu,
-                                             GValue const *handler_return,
-                                             gpointer data);
-void        cc_point_grid_align             (gdouble *x,
-                                             gdouble *y,
-                                             gdouble *width);
+gboolean            cc_accumulator_boolean              (GSignalInvocationHint *hint,
+                                                         GValue *return_accu,
+                                                         GValue const *handler_return,
+                                                         gpointer data);
+void                cc_point_grid_align                 (gdouble *x,
+                                                         gdouble *y,
+                                                         gdouble *width);
+#define             cc_return_if_unimplemented          (klass, member)
+#define             cc_return_if_unimplemented_code     (klass, member, CODE)
-

Description

+

Description

-

Details

+

Details

-

+

cc_accumulator_boolean ()

-
gboolean    cc_accumulator_boolean          (GSignalInvocationHint *hint,
-                                             GValue *return_accu,
-                                             GValue const *handler_return,
-                                             gpointer data);
+
gboolean            cc_accumulator_boolean              (GSignalInvocationHint *hint,
+                                                         GValue *return_accu,
+                                                         GValue const *handler_return,
+                                                         gpointer data);

Serves as a simple accumulator for signal emission. If you set cc_accumulator_boolean() as the accumulator for a signal, the signal will @@ -91,32 +95,27 @@ - -hint : +hint : a GSignalInvocationHint - -return_accu : +return_accu : a GValue for the emission - -handler_return : +handler_return : a GValue - -data : +data : unused - -Returns : +Returns : FALSE to stop, TRUE to continue. @@ -126,11 +125,11 @@

-

+

cc_point_grid_align ()

-
void        cc_point_grid_align             (gdouble *x,
-                                             gdouble *y,
-                                             gdouble *width);
+
void                cc_point_grid_align                 (gdouble *x,
+                                                         gdouble *y,
+                                                         gdouble *width);

Rounds the coordinates x and y. Rounds width to the nearest integer, the result of this conversion is needed for the other calculation. @@ -146,26 +145,81 @@ - -x : +x : an x coordinate - -y : +y : a y coordinate - -width : +width : the width of a line

+
+
+

+cc_return_if_unimplemented()

+
#define cc_return_if_unimplemented(klass, member) cc_return_if_unimplemented_code(klass, member, {})
+
+

+ +

+
++ + + + + + + + + + +
klass : +
member : + + +
+
+
+
+

+cc_return_if_unimplemented_code()

+
#define             cc_return_if_unimplemented_code(klass, member, CODE)
+

+ +

+
++ + + + + + + + + + + + + + +
klass : +
member : +
CODE : + + +
+
Binary files /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-view-data.png and /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-view-data.png differ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-View-Elements.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-View-Elements.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-View-Elements.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-View-Elements.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,31 +3,32 @@ View Elements - + - - + + - + - + + - + + + + + + - - - - - - + @@ -38,16 +39,22 @@ View Elements
-Item View - +Item View +
+
+Canvas Views +
+
+Cell Renderer
-Canvas Views - +Widget
-Cell Renderer - +printer
-Widget - +png-writer
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-View-Specific-Data.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-View-Specific-Data.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-View-Specific-Data.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-View-Specific-Data.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,189 @@ + + + + +View-Specific Data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+View-Specific Data

+

+ Sometimes it's useful to store some data that is connected to + a view. Every CcItem stores its bounding box in a view-dependent + way because different resolutions might result in different + bounding box sizes. CCC contains an API that makes using such + data as easy as using private + data with GObject. +

+
+

+ In this example we're creating an item that counts the number of clicks + that have happened per view. We're creating a type called SliffSloff and + the macro returning the GType will be SLIFF_TYPE_SLOFF. +

+
+

+Specifying View-Specific Data

+

+ To store some view-specific data, you have to specify a + structure that will be created for each view: +

+
typedef struct {
+        gint click_counter;
+} SliffSloffViewData;
+

+ Now we need to instruct libccc that we want this struct + to contain our view-specific data: +

+
static void
+sliff_sloff_class_init (SliffSloffClass* self_class)
+{
+        CcItemClass* item_class = CC_ITEM_CLASS (self_class);
+
+	/* Implement our own handlers for view (un)registration. More details later */
+	item_class->view_register   = sliff_sloff_view_register;
+	item_class->view_unregister = sliff_sloff_view_unregister;
+
+	/* Require the size of a SliffSloffViewData for the view data */
+	cc_item_class_add_view_data (self_class, sizeof (SliffSloffViewData));
+}
+
+
+

+Accessing View-Specific Data

+

+ CCC makes it very easy to access the view-specific data of + an item. Calling cc_item_get_view_data + will return a pointer to the memory chunk that stores the + view-specific data for a certain view of a certain item. +

+

+ But to make accessing this piece of memory easier, you can + define a macro that helps you to get the data: +

+
#define GET_VIEW_DATA(item,view) (CC_ITEM_GET_VIEW_DATA ((item), (view), SLIFF_TYPE_SLOFF, SliffSloffViewData))
+

+ Then you can easily access the view-data for a certain item + by calling GET_VIEW_DATA(item, view): +

+
/* sliff_sloff_frobnicate:
+ * @item: a #CcItem
+ * @view: a #CcView
+ *
+ * Frobnicate the #SliffSloff. This function gets called from
+ * the CcItem::button_press event handlers.
+ */
+static void
+sliff_sloff_frobnicate (CcItem* item,
+                        CcView* view)
+{
+        SliffSloffViewData* view_data = GET_VIEW_DATA (item, view);
+
+	view_data->click_counter++;
+}
+
+
+

+Memory Management

+

+ This section explains the details of the memory management + that's implemented in CCC. It's useful to read this section + at least once to understand the lifecycle of view-specific + data. +

+
+

+Allocate and Initialize the Memory

+

+ The memory allocation happens as early as possible. + The memory for the view-data gets allocated within + the default implementation of the CcItem::view-register + signal. +

+

+ This means that custom implementations of CcItem::view-register + absolutely need to chain up before + executing custom statements. +

+

+ After chaining up, you can initialize the data. It will be + pre-initialized with 0 so you don't have to initialize + integers or pointers to be 0 or NULL. +

+
static void
+sliff_sloff_view_register (CcItem* item,
+                           CcView* view)
+{
+        SliffSloffViewData* view_data;
+
+	/* call view_register from the parent class => allocate the memory */
+        CC_ITEM_CLASS (sliff_sloff_parent_class)->view_register (item, view);
+
+	view_data = GET_VIEW_DATA (item, view);
+
+	/* your custom code (not necessary in this case) */
+	view_data->click_counter = 0;
+}
+
+
+

+Clear and Free the Memory

+

+ Removing the view-specific data works exactly + the other way round. First you clean up the + memory and then you chain up into the CcItem::view-unregister + handler of the parent class to free the memory. +

+
static void
+sliff_sloff_view_unregister (CcItem* item,
+                             CcView* view)
+{
+        SliffSloffViewData* view_data;
+
+	view_data = GET_VIEW_DATA (item, view_data);
+
+	g_print ("SliffSloff %p received %d clicks on view %s (%p)",
+	         item, view_data->click_counter,
+		 G_OBJECT_TYPE_NAME (view), view);
+
+	/* here you can unref objects that you created per view */
+	view_data->click_counter = 0;
+
+	/* call view_unregister from the parent class => free the memory */
+	CC_ITEM_CLASS (sliff_sloff_parent_class)->view_unregister (item, view);
+}
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Widget.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Widget.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Widget.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Widget.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,26 +3,28 @@ Widget - + - + + - + + - + + + + + + - - - - - @@ -31,28 +33,28 @@ - + - + Signals

-Widget +Widget

-

Widget —

+

Widget
@@ -60,20 +62,21 @@

Synopsis

 
+#include <ccc.h>
 
 
-            CcViewWidget;
-            CcViewWidgetClass;
-GtkWidget*  cc_view_widget_new              (void);
-GtkWidget*  cc_view_widget_new_root         (CcItem *root);
-gboolean    cc_view_widget_get_center_view  (CcViewWidget const*self);
-void        cc_view_widget_set_center_view  (CcViewWidget *self,
-                                             gboolean center_view);
+                    CcViewWidget;
+                    CcViewWidgetClass;
+GtkWidget*          cc_view_widget_new                  (void);
+GtkWidget*          cc_view_widget_new_root             (CcItem *root);
+gboolean            cc_view_widget_get_center_view      (CcViewWidget const*self);
+void                cc_view_widget_set_center_view      (CcViewWidget *self,
+                                                         gboolean center_view);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
@@ -85,50 +88,46 @@
-

Implemented Interfaces

+

Implemented Interfaces

CcViewWidget implements - AtkImplementorIface.

+ CcView, CcItemView and AtkImplementorIface.

-

Properties

+

Properties

 
-  "center-view"          gboolean              : Read / Write
+  "center-view"              gboolean              : Read / Write
-

Signals

+

Signals

 
-"set-scroll-adjustments"
-            void        user_function      (CcViewWidget  *hadjustment,
-                                            GtkAdjustment *vadjustment,
-                                            GtkAdjustment *arg2,
-                                            gpointer       user_data)        : Run last
+  "set-scroll-adjustments"                         : Run Last
-

Description

+

Description

-

Details

+

Details

-

+

CcViewWidget

-
typedef struct _CcViewWidget CcViewWidget;
+
typedef struct _CcViewWidget CcViewWidget;

-

+

CcViewWidgetClass

-
typedef struct {
+
typedef struct {
 	GtkDrawingAreaClass base_class;
 
 	/* signals */
@@ -143,9 +142,9 @@
-

+

cc_view_widget_new ()

-
GtkWidget*  cc_view_widget_new              (void);
+
GtkWidget*          cc_view_widget_new                  (void);

Create a new CcViewWidget.

@@ -154,8 +153,7 @@

- + @@ -163,9 +161,9 @@
-

+

cc_view_widget_new_root ()

-
GtkWidget*  cc_view_widget_new_root         (CcItem *root);
+
GtkWidget*          cc_view_widget_new_root             (CcItem *root);

Create a new CcViewWidget and set root to be the model.

@@ -175,14 +173,12 @@

- + - + @@ -191,9 +187,9 @@
-

+

cc_view_widget_get_center_view ()

-
gboolean    cc_view_widget_get_center_view  (CcViewWidget const*self);
+
gboolean            cc_view_widget_get_center_view      (CcViewWidget const*self);

Find out whether the view is centered.

@@ -203,14 +199,12 @@

- + - + - + - + @@ -251,24 +243,24 @@
-

Property Details

+

Property Details

-

+

The "center-view" property

-
  "center-view"          gboolean              : Read / Write
+
  "center-view"              gboolean              : Read / Write

Display the model centered if there is more space than the model needs.

Default value: TRUE

-

Signal Details

+

Signal Details

-

+

The "set-scroll-adjustments" signal

-
void        user_function                  (CcViewWidget  *hadjustment,
-                                            GtkAdjustment *vadjustment,
-                                            GtkAdjustment *arg2,
-                                            gpointer       user_data)        : Run last
+
void                user_function                      (CcViewWidget  *hadjustment,
+                                                        GtkAdjustment *vadjustment,
+                                                        GtkAdjustment *arg2,
+                                                        gpointer       user_data)        : Run Last

This signal gets emitted when the widget is being added to a scrollable container.

@@ -279,20 +271,17 @@
- + - + - + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Working-with-the-Canvas.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Working-with-the-Canvas.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Working-with-the-Canvas.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Working-with-the-Canvas.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,27 +3,28 @@ Part I. Working with the Canvas - + - - + + - + + - + + + + + + - - - - -
-Returns :Returns : a newly created CcViewWidget which can be used to display a canvas.
-root :root : a CcItem, the model of the new view
-Returns :Returns : a new CcViewWidget with root as the model.
-self :self : a CcViewWidget
-Returns :Returns : TRUE if self displays its model centered once there's more space available than the model requires. @@ -221,10 +215,10 @@
-

+

cc_view_widget_set_center_view ()

-
void        cc_view_widget_set_center_view  (CcViewWidget *self,
-                                             gboolean center_view);
+
void                cc_view_widget_set_center_view      (CcViewWidget *self,
+                                                         gboolean center_view);

Specify whether the model should be displayed centered if there is as much space.

@@ -235,14 +229,12 @@
-self :self : a CcViewWidget
-center_view :center_view : a gboolean
-hadjustment :hadjustment : a GtkAdjustment
-vadjustment :vadjustment : a GtkAdjustment
-user_data :user_data : user data set when the signal handler was connected.
@@ -31,15 +32,34 @@ - +

-Working with the Canvas

+Part I. Working with the Canvas

- This part describes several aspects of the canvas that people will be - confronted with when developing applications with this canvas. -

+ This part describes several aspects of the canvas that people will be + confronted with when developing applications with this canvas. +

+
    +

  • + We'll start with some simple examples about creating a display + widget and adding some canvas items. + +

    • +

  • + If you want to use the flexibility of CCC and create your own + canvas items, the next section will explain how to use the + rapid prototyping API to quickly create your own items. + +

    • +

  • + Large applications will want to have their own set of canvas + items. The fourth part will walk you through the process of + creating your own full-featured canvas items. + +

    • +
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Writing-custom-canvas-items.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Writing-custom-canvas-items.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Writing-custom-canvas-items.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Writing-custom-canvas-items.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,35 +3,36 @@ Writing custom canvas items - + - - - + + + - + + - + + + + + + - - - - - - + - +

@@ -39,7 +40,14 @@
Deriving from the Item
Redrawing
+
View-Specific Data
+
+
Specifying View-Specific Data
+
Accessing View-Specific Data
+
Memory Management
+
Grid-fitting
+
Storing view-related data

This chapter leads you through the process of creating your first custom diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Zoom-and-Scroll.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Zoom-and-Scroll.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Zoom-and-Scroll.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Zoom-and-Scroll.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,31 +3,32 @@ Zooming and Scrolling - + - - + + - + - + + - + + + + + + - - - - - - + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Zooming.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Zooming.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ccc-Zooming.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ccc-Zooming.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,27 +3,28 @@ Zooming - + - + - + + - + + + + + + - - - - - diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/CcGradient.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/CcGradient.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/CcGradient.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/CcGradient.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,222 @@ + + + + +CcGradient + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+
+
+ + +
+

+CcGradient +

+

CcGradient

+
+
+

Synopsis

+
+
+#include <ccc.h>
+
+
+typedef             CcGradient;
+                    CcGradientClass;
+void                cc_gradient_add_stop                (CcGradient *self,
+                                                         gdouble offset,
+                                                         CcColor *color);
+cairo_pattern_t*    cc_gradient_create_pattern          (CcGradient const*self,
+                                                         CcView const *view,
+                                                         CcItem const *item);
+GType               cc_gradient_get_type                (void);
+
+
+
+
+

Object Hierarchy

+
+
+  GObject
+   +----GInitiallyUnowned
+         +----CcBrush
+               +----CcGradient
+                     +----CcLinearGradient
+                     +----CcRadialGradient
+
+
+
+

Description

+

+ +

+
+
+

Details

+
+

+CcGradient

+
typedef CcBrush                 CcGradient;
+
+

+ +

+
+
+
+

+CcGradientClass

+
typedef struct {
+	CcBrushClass base_class;
+
+	/* vtable */
+	cairo_pattern_t* (*create_pattern)(CcGradient const* self,
+					   CcView const    * view,
+					   CcItem const    * item);
+} CcGradientClass;
+
+

+ +

+
+
+
+

+cc_gradient_add_stop ()

+
void                cc_gradient_add_stop                (CcGradient *self,
+                                                         gdouble offset,
+                                                         CcColor *color);
+

+Adds a color stop to a gradient. Color stops don't need to be inserted in +order sorting happens automatically.

+

+ +

+
++ + + + + + + + + + + + + + +
self : a CcGradient +
offset : the offset of the color stop (in [0.0;1.0]) +
color : the CcColor for this stop +
+
+
+
+

+cc_gradient_create_pattern ()

+
cairo_pattern_t*    cc_gradient_create_pattern          (CcGradient const*self,
+                                                         CcView const *view,
+                                                         CcItem const *item);
+

+Creates a cairo_pattern_t for rendering a gradient on item in view.

+

+ +

+
++ + + + + + + + + + + + + + + + + + +
self : a CcGradient +
view : a CcView +
item : a CcItem +
Returns :a cairo_pattern_t. +
+
+
+
+

+cc_gradient_get_type ()

+
GType               cc_gradient_get_type                (void);
+

+ +

+
++ + + + +
Returns : + + +
+
+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch01.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch01.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch01.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch01.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,85 @@ + + + + +Using the Canvas + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+Using the Canvas

+
Display a Rectangle
+

+ This chapter will introduce you into using CCC for creating + custom widgets by using the canvas and the delivered + primitives. +

+
+

+Display a Rectangle

+

+ Create a rectangle: +

+
CcItem* rectangle = cc_rectangle_new ();
+

+ Specify the position (0,0) and size (100x100) of the rectangle: +

+
cc_rectangle_set_position (CC_RECTANGLE (rectangle),
+                           0.0, 0.0,
+			   100.0, 100.0);
+

+ Fill the rectangle with red color: +

+
cc_rectangle_set_brush_content (CC_RECTANGLE (rectangle),
+				cc_brush_color_new (cc_color_new_rgb (1.0, 0.0, 0.0)));
+

+ Create a GtkWindow and a CcViewWidget : +

+
GtkWidget* view = cc_view_widget_new ();
+GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+/* put the view into the window */
+gtk_container_add (GTK_CONTAINER (window), view);
+

+ Tell the view widget to display the rectangle: +

+
cc_view_set_root (CC_VIEW (view), rectangle);
+

+ And now run the main loop: +

+
gtk_main ();
+

+ Congratulations. +

+
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch02s02.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch02s02.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch02s02.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch02s02.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,65 @@ + + + + +Managing Redrawing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+Managing Redrawing

+

+ As you already saw in the previous section; you trigger updates + by calling cc_item_dirty. + Once a view requests the item to be redrawn, it triggers the + CcSimpleItem::render + signal. +

+
static void
+render_item (CcItem* item,
+             CcView* view,
+             cairo_t* cr,
+             gpointer user_data)
+{
+        /* render the item to the canvas */
+        cairo_rectangle (cr, 0.0, 0.0, 100.0, 100.0);
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0);
+        cairo_fill (cr);
+}
+
+…
+        g_signal_connect (custom_item, "render",
+                          G_CALLBACK (render_item), NULL);
+…
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch02s03.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch02s03.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch02s03.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch02s03.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,112 @@ + + + + +Hit-Testing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+Hit-Testing

+

+ To be able to add interaction to your items, the canvas + needs to figure out whether or not a point is within the + item. This is important for two reasons: +

+
    +

  1. + An item doesn't have to be rectangular: if you have + a circle, you don't want the circle to be treated + like a rectangle (eg. accept clicks to the part of the + bounding box which isn't part of a circle). +

    2. +

  2. + Items might have transparent areas. If you have a + rectangular frame which doesn't have any content, + you usually want to forward clicks that happen inside + of the frame to the item that has actually been + meant by the user. +

    3. +
+

+ Hit-Testing can be implemented by connecting to the CcSimpleItem::distance + signal: +

+
static gdouble
+distance_to_item (CcItem  * item,
+                  CcView  * view,
+		  gdouble   x,
+		  gdouble   y,
+		  CcItem  **found,
+		  gpointer user_data)
+{
+	if ((x < 0.0 || x > 100.0) && (y < 0.0 || y > 100.0)) {
+		// completely outside
+		if (x < 0.0 && y < 0.0) {
+			return hypot (0.0 - x, 0.0 - y);
+		} else if (x < 0.0) {
+			return hypot (0.0 - x, y - 100.0);
+		} else if (x > 100.0 && y < 0) {
+			return hypot (x - 100.0, 0.0 - y);
+		} else {
+			return hypot (x - 100.0, y - 100.0);
+		}
+	}
+
+	if (x < 0.0) {
+		return 0.0 - x;
+	}
+
+	if (x > 100.0) {
+		return x - 100.0;
+	}
+
+	if (y < 0.0) {
+		return 0.0 - y;
+	}
+
+	if (y > 100.0) {
+		return x - 100.0;
+	}
+
+	*found = item;
+
+	return 0.0;
+}
+
+…
+	g_signal_connect (simple_item, "distance",
+			  G_CALLBACK (distance_to_item), NULL);
+…
+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch03s04.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch03s04.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/ch03s04.html 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/ch03s04.html 2007-05-05 23:29:46.000000000 +0100 @@ -0,0 +1,54 @@ + + + + +Storing view-related data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+Storing view-related data

+

+ Sometimes you want to store some data per view. The CcText + implementation eg. uses one PangoLayout per view. Sometimes + it's just necessary and CCC helps you to manage this + view-related data very easily. +

+

+ The API described here is designed very similar to the implementation + of private object data in GObject. + The only difference is that one item stores multiple data chunks, one + per view. +

+
+ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/index.html /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/index.html --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/index.html 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/index.html 2007-05-05 23:29:46.000000000 +0100 @@ -3,122 +3,178 @@ libccc Reference Manual - + - + - + + - + + + + + + - - - - -
-
-

Table of Contents

-
+
I. Working with the Canvas
-
Known Bugs
-
Rendering Bugs
+
Using the Canvas
+
Display a Rectangle
+
Rapid Prototyping of custom Items
+
+
Managing the Bounding Box
+
Managing Redrawing
+
Hit-Testing
+
Writing custom canvas items
Deriving from the Item
Redrawing
-
Grid-fitting
-
-
-
II. Internals
-
-
Bounds Handling
-
-
Bound Caching
-
Redrawing
-
-
Event Handling
-
Picking Events
-
Focus Handling
+
View-Specific Data
-
Introduction
-
The focus signal
-
-
The Beginning
-
The Sequel
-
The Final
+
Specifying View-Specific Data
+
Accessing View-Specific Data
+
Memory Management
+
Grid-fitting
+
Storing view-related data
-
Zooming and Scrolling
-
-
Scrolling
-
Zooming
-
-
Known Bugs
-
Rendering Bugs
+
+Resolution Independence +
-
III. API Reference
+
II. API Reference
Object Hierarchy
Fundamentals
-Brushes - +Brushes +
+
+Color Brush
-Color Brush - +Colors
-Colors - +CcGradient
-Rectangle - +cc-linear-gradient
-Utilities - +cc-radial-gradient +
+
+Rectangle +
+
+Utilities
Canvas Items
-The Base Item - +The Base Item +
+
+Simple Item
-Rectangles - +shape
-Text - +line +
+
+circle +
+
+Rectangles +
+
+rounded-rectangle +
+
+pixbuf +
+
+Text +
+
+cc-caret +
+
+CcCamera
View Elements
-Item View - +Item View +
+
+Canvas Views +
+
+Cell Renderer
-Canvas Views - +Widget
-Cell Renderer - +printer
-Widget - +png-writer
-
-
+
III. Internals
+
+
Bounds Handling
+
+
Bound Caching
+
Redrawing
+
+
Event Handling
+
Picking Events
+
Focus Handling
+
+
Introduction
+
The focus signal
+
+
The Beginning
+
The Sequel
+
The Final
+
+
+
+CcHashMap +
+
Zooming and Scrolling
+
+
Scrolling
+
Zooming
+
+
Known Bugs
+
Rendering Bugs
+
+
diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/index.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/index.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/index.sgml 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/index.sgml 2007-05-05 23:29:46.000000000 +0100 @@ -1,3 +1,12 @@ + + + + + + + + + @@ -13,14 +22,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30,10 +75,14 @@ + + + + @@ -42,6 +91,11 @@ + + + + + @@ -51,6 +105,18 @@ + + + + + + + + + + + + @@ -68,16 +134,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85,16 +224,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102,6 +268,18 @@ + + + + + + + + + + + + @@ -117,3 +295,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/style.css /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/style.css --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/html/style.css 2006-09-03 19:57:15.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/html/style.css 2007-05-05 23:29:46.000000000 +0100 @@ -19,7 +19,8 @@ { vertical-align: top; } -div a[name] +/* this is needed so that the local anchors are displayed below the naviagtion */ +div.refnamediv a[name], div.refsect1 a[name] { position: relative; top: -4.5em; @@ -54,7 +55,7 @@ font-size: 80%; } -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1 +div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface { position: relative; top: 3em; @@ -86,3 +87,26 @@ text-decoration: underline; color: #FF0000; } + +div.table table +{ + border-collapse: collapse; + border-spacing: 0px; + border-style: solid; + border-color: #777777; + border-width: 1px; +} + +div.table table td, div.table table th +{ + border-style: solid; + border-color: #777777; + border-width: 1px; + padding: 3px; + vertical-align: top; +} + +div.table table th +{ + background-color: #eeeeee; +} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/Makefile.am 2006-06-13 12:02:22.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/Makefile.am 2007-05-05 14:50:44.000000000 +0100 @@ -9,6 +9,25 @@ all-recursive: all +FILE=$(shell git branch | /bin/grep \* | sed 's/.*\* //') + +report: all-am $(DOC_MODULE)-unused.txt $(DOC_MODULE)-undocumented.txt + @echo "Building report" + rm -f $(FILE) + echo "

API Documentation

" > $(FILE); \ + if test -f $(DOC_MODULE)-unused.txt; then \ + echo "

Unused Items

" >> $(FILE); \ + echo -n "
" >> $(FILE); \
+		cat $(DOC_MODULE)-unused.txt >> $(FILE); \
+		echo "
" >> $(FILE); \ + fi + if test -f $(DOC_MODULE)-undocumented.txt; then \ + echo "

Undocumented Items

" >> $(FILE); \ + echo -n "
" >> $(FILE); \
+		cat $(DOC_MODULE)-undocumented.txt >> $(FILE); \
+		echo "
" >> $(FILE); \ + fi + # all: tmpl.stamp # This is a blank Makefile.am for using gtk-doc. @@ -67,6 +86,7 @@ HTML_IMAGES=\ ccc-grid-fitting-with.png \ ccc-grid-fitting-without.png \ + ccc-view-data.png \ $(NULL) # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). @@ -77,6 +97,7 @@ ccc-custom-items.xml \ ccc-events.xml \ ccc-focus-handling.xml \ + ccc-view-data.xml \ ccc-zoom-and-scroll.xml \ $(NULL) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/Makefile.in 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/Makefile.in 2007-05-05 23:17:41.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,7 +19,6 @@ #################################### # Everything below here is generic # #################################### - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -27,7 +26,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -41,7 +39,27 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gtk-doc.make +subdir = doc/reference +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -59,6 +77,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -68,7 +88,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -81,6 +105,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -89,6 +114,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -136,7 +163,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -174,6 +203,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -190,6 +221,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -215,6 +248,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -232,6 +266,7 @@ # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 +FILE = $(shell git branch | /bin/grep \* | sed 's/.*\* //') # all: tmpl.stamp @@ -292,6 +327,7 @@ HTML_IMAGES = \ ccc-grid-fitting-with.png \ ccc-grid-fitting-without.png \ + ccc-view-data.png \ $(NULL) @@ -303,6 +339,7 @@ ccc-custom-items.xml \ ccc-events.xml \ ccc-focus-handling.xml \ + ccc-view-data.xml \ ccc-zoom-and-scroll.xml \ $(NULL) @@ -327,7 +364,6 @@ $(CCC_LIBS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) @@ -338,26 +374,17 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - # This includes the standard gtk-doc make rules, copied by gtkdocize. # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt\ - - +EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ @@ -365,24 +392,39 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals - CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS) -subdir = doc/reference -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make \ - Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/reference/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/reference/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: -rm -f *.lo @@ -399,13 +441,9 @@ ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/../.. + $(mkdir_p) $(distdir)/../.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -417,7 +455,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -438,7 +476,6 @@ check-am: all-am check: check-am all-am: Makefile all-local - installdirs: install: install-am install-exec: install-exec-am @@ -460,7 +497,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -477,6 +514,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -511,12 +550,13 @@ uninstall-am: uninstall-info-am uninstall-local .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ uninstall-info-am uninstall-local @@ -527,64 +567,83 @@ all-recursive: all +report: all-am $(DOC_MODULE)-unused.txt $(DOC_MODULE)-undocumented.txt + @echo "Building report" + rm -f $(FILE) + echo "

API Documentation

" > $(FILE); \ + if test -f $(DOC_MODULE)-unused.txt; then \ + echo "

Unused Items

" >> $(FILE); \ + echo -n "
" >> $(FILE); \
+		cat $(DOC_MODULE)-unused.txt >> $(FILE); \
+		echo "
" >> $(FILE); \ + fi + if test -f $(DOC_MODULE)-undocumented.txt; then \ + echo "

Undocumented Items

" >> $(FILE); \ + echo -n "
" >> $(FILE); \
+		cat $(DOC_MODULE)-undocumented.txt >> $(FILE); \
+		echo "
" >> $(FILE); \ + fi + @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp +@ENABLE_GTK_DOC_FALSE@all-local: + +docs: html-build.stamp #### scan #### -@ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -@ENABLE_GTK_DOC_TRUE@ else \ -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \ -@ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@ENABLE_GTK_DOC_TRUE@ test -f $$i || touch $$i ; \ -@ENABLE_GTK_DOC_TRUE@ done \ -@ENABLE_GTK_DOC_TRUE@ fi -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) -@ENABLE_GTK_DOC_TRUE@ touch scan-build.stamp +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(srcdir)/$(DOC_MODULE).types + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp -@ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true #### templates #### -@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp -@ENABLE_GTK_DOC_TRUE@tmpl.stamp: tmpl-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true +tmpl.stamp: tmpl-build.stamp + @true #### xml #### -@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp -@ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true +sgml.stamp: sgml-build.stamp + @true #### html #### -@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html -@ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ touch html-build.stamp -@ENABLE_GTK_DOC_FALSE@all-local: +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp ############## @@ -626,12 +685,12 @@ mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/* $(distdir)/html + cp $(srcdir)/html/* $(distdir)/html if test -f $(srcdir)/$(DOC_MODULE).types; then \ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ fi -.PHONY : dist-hook-local +.PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/brush.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/brush.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/brush.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/brush.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -37,6 +37,8 @@ @self: +@view: +@item: @cr: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/camera.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/camera.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/camera.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/camera.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,66 @@ + +CcCamera + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@root: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@root: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-caret.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-caret.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-caret.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-caret.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,51 @@ + +cc-caret + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@self: +@x1: +@y1: +@x2: +@y2: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/ccc-unused.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/ccc-unused.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/ccc-unused.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/ccc-unused.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -1,7 +1,261 @@ - + -@i: + + + + + + + + + + + + + + + + +display canvas items in canvas items + + + + + + + + + + + + + + + + + + + + + + + +hashmap + + + + + + + + + + + + + + + + + + + + + + + +Box Layout (Horizontal) + + + + + + + + + + + + + + + + + + + + + + + +Layout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@iface: +@set_child_property: +@get_child_property: + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@layout: +@child: +@first_property_name: +@Varargs: + + + + + + +@layout: +@child: +@property_name: +@value: + + + + + + +@layout: +@child: +@first_property_name: +@var_args: + + + + + + +@layout: +@child: +@first_property_name: +@Varargs: + + + + + + +@layout: +@child: +@property_name: +@value: + + + + + + +@layout: +@child: +@first_property_name: +@var_args: + + + + + + +@Returns: + + + + + + +@iface: +@property_name: +@Returns: + + + + + + +@klass: +@property_id: +@pspec: + + + + + + +@klass: +@n_properties: +@Returns: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-gradient.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-gradient.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-gradient.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-gradient.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,62 @@ + +CcGradient + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@base_class: +@create_pattern: + + + + + + +@self: +@offset: +@color: + + + + + + + +@self: +@view: +@item: +@Returns: + + + + + + + +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-hashmap.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-hashmap.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-hashmap.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-hashmap.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,78 @@ + +CcHashMap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@self: +@func: +@user_data: + + + + + + + +@self: +@key: +@data: + + + + + + + +@self: +@key: +@Returns: + + + + + + + +@content_type: +@Returns: + + + + + + + +@self: +@key: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-linear-gradient.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-linear-gradient.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-linear-gradient.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-linear-gradient.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,71 @@ + +cc-linear-gradient + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@x1: +@y1: +@x2: +@y2: +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-radial-gradient.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-radial-gradient.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-radial-gradient.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-radial-gradient.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,65 @@ + +cc-radial-gradient + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@x: +@y: +@radius: +@Returns: + + + + + + + +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-simple-item.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-simple-item.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-simple-item.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-simple-item.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,68 @@ + +Simple Item + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@ccsimpleitem: the object which received the signal. +@arg1: +@arg2: +@arg3: +@arg4: +@Returns: + + + + + + +@ccsimpleitem: the object which received the signal. +@arg1: +@arg2: + + + + + + +@ccsimpleitem: the object which received the signal. +@arg1: + + + + + + + + + + + + +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-unit.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-unit.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/cc-unit.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/cc-unit.sgml 2007-05-05 23:29:42.000000000 +0100 @@ -0,0 +1,61 @@ + +Resolution Independence + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@CC_UNIT_DISPLAY_PIXEL: +@CC_UNIT_POINT: +@CC_UNIT_PT: + + + + + + +@value: +@unit: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/circle.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/circle.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/circle.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/circle.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,77 @@ + +circle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@base_class: + + + + + + +@Returns: + + + + + + + +@Returns: + + + + + + + +@self: +@x: +@y: + + + + + + + +@self: +@radius: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/color.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/color.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/color.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/color.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -28,6 +28,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,6 +130,19 @@ @self: -@cr: +@red: +@green: +@blue: +@alpha: + + + + + + + +@self: +@pattern: +@offset: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/hashmap.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/hashmap.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/hashmap.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/hashmap.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,81 @@ + +hashmap + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@self: +@func: +@user_data: + + + + + + + +@Returns: + + + + + + + +@self: +@key: +@data: + + + + + + + +@self: +@key: +@Returns: + + + + + + + +@content_type: +@Returns: + + + + + + + +@self: +@key: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/hbox-layout.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/hbox-layout.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/hbox-layout.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/hbox-layout.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,39 @@ + +Box Layout (Horizontal) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/item.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/item.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/item.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/item.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -211,6 +211,26 @@ @view_register: @view_unregister: + + + + + +@item_class: +@view_data_size: + + + + + + + +@self: +@view: +@type: +@Returns: + + @@ -244,6 +264,7 @@ @self: +@view: @x: @y: @found: @@ -288,6 +309,52 @@ @grid_aligned: + + + + + +@child: +@parent: + + + + + + + +@child: +@parent: + + + + + + + +@child: +@parent: + + + + + + + +@child: +@parent: + + + + + + + +@child: +@parent: +@position: + + @@ -339,3 +406,113 @@ @m: + + + + + +@i: + + + + + + + +@item: +@view: +@data: + + + + + + + +@self: +@view: + + + + + + + +@self: +@view: + + + + + + + +@Returns: + + + + + + + +@self: +@func: +@data: + + + + + + + +@self: +@view: +@Returns: + + + + + + + +@self: +@view: + + + + + + + +@child: +@parent: +@Returns: + + + + + + + +@self: +@view: + + + + + + + +@self: +@data: + + + + + + + +@self: +@view: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/item-view.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/item-view.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/item-view.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/item-view.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -17,6 +17,12 @@ + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/layout.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/layout.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/layout.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/layout.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,138 @@ + +Layout + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@iface: +@set_child_property: +@get_child_property: + + + + + + +@layout: +@child: +@first_property_name: +@Varargs: + + + + + + + +@layout: +@child: +@property_name: +@value: + + + + + + + +@layout: +@child: +@first_property_name: +@var_args: + + + + + + + +@layout: +@child: +@first_property_name: +@Varargs: + + + + + + + +@layout: +@child: +@property_name: +@value: + + + + + + + +@layout: +@child: +@first_property_name: +@var_args: + + + + + + + +@Returns: + + + + + + + +@iface: +@property_name: +@Returns: + + + + + + + +@klass: +@property_id: +@pspec: + + + + + + + +@klass: +@n_properties: +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/line.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/line.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/line.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/line.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,75 @@ + +line + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@self: + + + + + + + +@Returns: + + + + + + + +@self: +@x: +@y: + + + + + + + +@self: +@x: +@y: + + + + + + + +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/pixbuf.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/pixbuf.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/pixbuf.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/pixbuf.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,144 @@ + +pixbuf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@self: +@Returns: + + + + + + + +@Returns: + + + + + + + +@Returns: + + + + + + + +@self: +@pixbuf: + + + + + + + +@self: +@x: +@y: +@w: +@h: + + + + + + + +@self: +@rotation: + + + + + + + +@self: +@pos_x: + + + + + + + +@self: +@pos_y: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/png-writer.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/png-writer.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/png-writer.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/png-writer.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,54 @@ + +png-writer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@base_class: + + + + + + +@Returns: + + + + + + + +@filename: +@Returns: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/printer.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/printer.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/printer.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/printer.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,62 @@ + +printer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@base_class: + + + + + + +@Returns: + + + + + + + +@filename: +@Returns: + + + + + + + +@self: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/rectangle.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/rectangle.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/rectangle.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/rectangle.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -70,3 +70,39 @@ @h: + + + + + +@self: +@height: + + + + + + + +@self: +@width: + + + + + + + +@self: +@x: + + + + + + + +@self: +@y: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/rounded-rectangle.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/rounded-rectangle.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/rounded-rectangle.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/rounded-rectangle.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,53 @@ + +rounded-rectangle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@self: +@radius: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/shape.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/shape.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/shape.sgml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/shape.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,122 @@ + +shape + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@base_class: +@path: +@render_content: +@render_border: + + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@Returns: + + + + + + + +@shape: +@view: +@Returns: + + + + + + + +@self: +@brush: + + + + + + + +@self: +@brush: + + + + + + + +@self: +@width: + + + + + + + +@self: +@width: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/text.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/text.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/text.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/text.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -28,6 +28,16 @@ + + + + + + + + + + @@ -54,7 +64,7 @@ @base_class: -@delete: +@remove: @insert: @@ -85,3 +95,66 @@ @anchor: + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@editable: + + + + + + + +@self: +@desc: + + + + + + + +@self: +@markup: + + + + + + + +@self: +@size_pixels: + + + + + + + +@self: +@text: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/utils.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/utils.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/utils.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/utils.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -39,3 +39,22 @@ @width: + + + + + +@klass: +@member: + + + + + + + +@klass: +@member: +@CODE: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/view.sgml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/view.sgml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/tmpl/view.sgml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/tmpl/view.sgml 2007-05-05 23:29:43.000000000 +0100 @@ -17,6 +17,47 @@ + + + + + +@CC_ZOOM_PIXELS: +@CC_ZOOM_WIDTH: +@CC_ZOOM_HEIGHT: +@CC_ZOOM_AUTO: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85,3 +126,72 @@ @y: + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@item: +@mask: +@cursor: +@time: +@Returns: + + + + + + + +@self: +@focus: + + + + + + + +@self: +@scrolled_region: + + + + + + + +@self: +@item: +@time: + + + + + + + +@self: +@x: +@y: + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/brush-color.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/brush-color.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/brush-color.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/brush-color.xml 2007-05-05 23:29:43.000000000 +0100 @@ -19,14 +19,15 @@ +#include <ccc.h> - CcBrushColor; - CcBrushColorClass; -CcBrush* cc_brush_color_new (CcColor *color); -CcColor* cc_brush_color_get_color (CcBrushColor *self); -void cc_brush_color_set_color (CcBrushColor *self, - CcColor *color); + CcBrushColor; + CcBrushColorClass; +CcBrush* cc_brush_color_new (CcColor *color); +CcColor* cc_brush_color_get_color (CcBrushColor *self); +void cc_brush_color_set_color (CcBrushColor *self, + CcColor *color); @@ -51,7 +52,7 @@ Properties - "color" CcColor : Read / Write / Construct + "color" CcColor : Read / Write / Construct @@ -83,7 +84,7 @@ <anchor id="cc-brush-color-new" role="function"/>cc_brush_color_new () -cc_brush_color_newCcBrush* cc_brush_color_new (CcColor *color); +cc_brush_color_newCcBrush* cc_brush_color_new (CcColor *color); @@ -97,7 +98,7 @@ <anchor id="cc-brush-color-get-color" role="function"/>cc_brush_color_get_color () -cc_brush_color_get_colorCcColor* cc_brush_color_get_color (CcBrushColor *self); +cc_brush_color_get_colorCcColor* cc_brush_color_get_color (CcBrushColor *self); @@ -111,8 +112,8 @@ <anchor id="cc-brush-color-set-color" role="function"/>cc_brush_color_set_color () -cc_brush_color_set_colorvoid cc_brush_color_set_color (CcBrushColor *self, - CcColor *color); +cc_brush_color_set_colorvoid cc_brush_color_set_color (CcBrushColor *self, + CcColor *color); @@ -130,7 +131,7 @@ Property Details <anchor id="CcBrushColor--color"/>The "<literal>color</literal>" property -CcBrushColor:color "color" CcColor : Read / Write / Construct +CcBrushColor:color "color" CcColor : Read / Write / Construct The color. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/brush.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/brush.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/brush.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/brush.xml 2007-05-05 23:29:43.000000000 +0100 @@ -19,12 +19,15 @@ +#include <ccc.h> - CcBrush; - CcBrushClass; -void cc_brush_apply (CcBrush *self, - cairo_t *cr); + CcBrush; + CcBrushClass; +void cc_brush_apply (CcBrush *self, + CcView *view, + CcItem *item, + cairo_t *cr); @@ -37,6 +40,7 @@ +----GInitiallyUnowned +----CcBrush +----CcBrushColor + +----CcGradient @@ -70,6 +74,8 @@ /* vtable */ void (*apply) (CcBrush* brush, + CcView * view, + CcItem * item, cairo_t* cr); } CcBrushClass; @@ -91,17 +97,28 @@ <anchor id="cc-brush-apply" role="function"/>cc_brush_apply () -cc_brush_applyvoid cc_brush_apply (CcBrush *self, - cairo_t *cr); +cc_brush_applyvoid cc_brush_apply (CcBrush *self, + CcView *view, + CcItem *item, + cairo_t *cr); -Apply a brush to a cairo context. This is usually used from item -implementations while rendering to a context. +Apply a brush to a cairo context. The brush will be used to display item in +view. + + +This is usually used from item implementations while rendering to a context. self : a CcBrush +view : + a CcView + +item : + a CcItem + cr : a cairo context diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/camera.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/camera.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/camera.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/camera.xml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,146 @@ + + + + +CcCamera +3 +CCC Library + + + +CcCamera + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcCamera; +typedef CcCameraClass; +CcItem* cc_camera_new (void); +CcItem* cc_camera_new_root (CcItem *root); +CcItem* cc_camera_get_root (CcItem const*self); +void cc_camera_set_root (CcCamera *self, + CcItem *root); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcCamera + + + + + + + +Implemented Interfaces + +CcCamera implements + CcView and CcItemView. + + + + + + + + +Description + + + + + + +Details + +<anchor id="CcCamera" role="typedef"/>CcCamera +CcCameratypedef CcItem CcCamera; + + + + + +<anchor id="CcCameraClass" role="typedef"/>CcCameraClass +CcCameraClasstypedef CcItemClass CcCameraClass; + + + + + +<anchor id="cc-camera-new" role="function"/>cc_camera_new () +cc_camera_newCcItem* cc_camera_new (void); + + + +Returns : + + + + + +<anchor id="cc-camera-new-root" role="function"/>cc_camera_new_root () +cc_camera_new_rootCcItem* cc_camera_new_root (CcItem *root); + + + +root : + + +Returns : + + + + + +<anchor id="cc-camera-get-root" role="function"/>cc_camera_get_root () +cc_camera_get_rootCcItem* cc_camera_get_root (CcItem const*self); + + + +self : + + +Returns : + + + + + +<anchor id="cc-camera-set-root" role="function"/>cc_camera_set_root () +cc_camera_set_rootvoid cc_camera_set_root (CcCamera *self, + CcItem *root); + + + +self : + + +root : + + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-caret.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-caret.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-caret.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-caret.xml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,133 @@ + + + + +cc-caret +3 +CCC Library + + + +cc-caret + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcCaret; +typedef CcCaretClass; +CcItem* cc_caret_new (void); +void cc_caret_set_position (CcCaret *self, + gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcShape + +----CcLine + +----CcCaret + + + + + + + +Implemented Interfaces + +CcCaret implements + CcItemView. + + + + + + + + +Description + + + + + + +Details + +<anchor id="CcCaret" role="typedef"/>CcCaret +CcCarettypedef CcLine CcCaret; + + + + + +<anchor id="CcCaretClass" role="typedef"/>CcCaretClass +CcCaretClasstypedef CcLineClass CcCaretClass; + + + + + +<anchor id="cc-caret-new" role="function"/>cc_caret_new () +cc_caret_newCcItem* cc_caret_new (void); + + + +Returns : + + + + + +<anchor id="cc-caret-set-position" role="function"/>cc_caret_set_position () +cc_caret_set_positionvoid cc_caret_set_position (CcCaret *self, + gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); + + + +self : + + +x1 : + + +y1 : + + +x2 : + + +y2 : + + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-gradient.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-gradient.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-gradient.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-gradient.xml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,149 @@ + + + + +CcGradient +3 +CCC Library + + + +CcGradient + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcGradient; + CcGradientClass; +void cc_gradient_add_stop (CcGradient *self, + gdouble offset, + CcColor *color); +cairo_pattern_t* cc_gradient_create_pattern (CcGradient const*self, + CcView const *view, + CcItem const *item); +GType cc_gradient_get_type (void); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcBrush + +----CcGradient + +----CcLinearGradient + +----CcRadialGradient + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="CcGradient" role="typedef"/>CcGradient +CcGradienttypedef CcBrush CcGradient; + + + + + +<anchor id="CcGradientClass" role="struct"/>CcGradientClass +CcGradientClasstypedef struct { + CcBrushClass base_class; + + /* vtable */ + cairo_pattern_t* (*create_pattern)(CcGradient const* self, + CcView const * view, + CcItem const * item); +} CcGradientClass; + + + + + +<anchor id="cc-gradient-add-stop" role="function"/>cc_gradient_add_stop () +cc_gradient_add_stopvoid cc_gradient_add_stop (CcGradient *self, + gdouble offset, + CcColor *color); + +Adds a color stop to a gradient. Color stops don't need to be inserted in +order sorting happens automatically. + + + +self : + a CcGradient + +offset : + the offset of the color stop (in [0.0;1.0]) + +color : + the CcColor for this stop + + + +<anchor id="cc-gradient-create-pattern" role="function"/>cc_gradient_create_pattern () +cc_gradient_create_patterncairo_pattern_t* cc_gradient_create_pattern (CcGradient const*self, + CcView const *view, + CcItem const *item); + +Creates a cairo_pattern_t for rendering a gradient on item in view. + + + +self : + a CcGradient + +view : + a CcView + +item : + a CcItem + +Returns :a cairo_pattern_t. + + + +<anchor id="cc-gradient-get-type" role="function"/>cc_gradient_get_type () +cc_gradient_get_typeGType cc_gradient_get_type (void); + + + +Returns : + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-hashmap.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-hashmap.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-hashmap.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-hashmap.xml 2007-05-05 23:29:43.000000000 +0100 @@ -0,0 +1,183 @@ + + + + +CcHashMap +3 +CCC Library + + + +CcHashMap + + + + + +Synopsis + + + +#include <ccc/cc-hash-map.h> + + + CcHashMap; +void cc_hash_map_foreach (CcHashMap *self, + GHFunc func, + gpointer user_data); +void cc_hash_map_insert (CcHashMap *self, + gpointer key, + gpointer data); +gpointer cc_hash_map_lookup (CcHashMap *self, + gconstpointer key); +CcHashMap* cc_hash_map_new (GType content_type); +void cc_hash_map_remove (CcHashMap *self, + gconstpointer key); + + + + + +Object Hierarchy + + + GObject + +----CcHashMap + + + + + + + + + +Properties + + + "content" GType : Read / Write / Construct Only + + + + + + +Description + + + + + + +Details + +<anchor id="CcHashMap-struct" role="struct"/>CcHashMap +CcHashMaptypedef struct _CcHashMap CcHashMap; + +A hash map object for CCC. + + + + +<anchor id="cc-hash-map-foreach" role="function"/>cc_hash_map_foreach () +cc_hash_map_foreachvoid cc_hash_map_foreach (CcHashMap *self, + GHFunc func, + gpointer user_data); + +Execute a function on each item from a CcHashMap. + + + +self : + a CcHashMap + +func : + a GHFunc + +user_data : + user_data for func + + + +<anchor id="cc-hash-map-insert" role="function"/>cc_hash_map_insert () +cc_hash_map_insertvoid cc_hash_map_insert (CcHashMap *self, + gpointer key, + gpointer data); + +Inserts value into self (indexed by key). + + + +self : + a CcHashMap + +key : + the key that will be used for inserting + +data : + the value to be inserted + + + +<anchor id="cc-hash-map-lookup" role="function"/>cc_hash_map_lookup () +cc_hash_map_lookupgpointer cc_hash_map_lookup (CcHashMap *self, + gconstpointer key); + +Looks up the data for key. + + + +self : + a CcHashMap + +key : + a key + +Returns :the data belonging to key, NULL if no data was found. + + + +<anchor id="cc-hash-map-new" role="function"/>cc_hash_map_new () +cc_hash_map_newCcHashMap* cc_hash_map_new (GType content_type); + +Create a new CcHashMap that can hold items of the GType content_type. + + + +content_type : + a GType for the content + +Returns :a new CcHashMap. + + + +<anchor id="cc-hash-map-remove" role="function"/>cc_hash_map_remove () +cc_hash_map_removevoid cc_hash_map_remove (CcHashMap *self, + gconstpointer key); + +Removes the data that was registered in self with the index key. + + + +self : + a CcHashMap + +key : + a key + + + + + +Property Details +<anchor id="CcHashMap--content"/>The "<literal>content</literal>" property +CcHashMap:content "content" GType : Read / Write / Construct Only +The Type of the content. + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-linear-gradient.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-linear-gradient.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-linear-gradient.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-linear-gradient.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,174 @@ + + + + +cc-linear-gradient +3 +CCC Library + + + +cc-linear-gradient + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcLinearGradient; +typedef CcLinearGradientClass; +GType cc_linear_gradient_get_type (void); +CcBrush* cc_linear_gradient_new (gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcBrush + +----CcGradient + +----CcLinearGradient + + + + + + + + + +Properties + + + "x1" gdouble : Read / Write + "x2" gdouble : Read / Write + "y1" gdouble : Read / Write + "y2" gdouble : Read / Write + + + + + + +Description + +Linear gradients are a very nice pattern to fill items with. To permit +gradients to be applied to different items, the API got designed a bit +tricky (but still easy to understand). + + +Instead of working with exact coordinates on items, you specify two points +for the gradient (the start and the end) relative to the item's bounding +box. + + +A gradient from (0.0; 0.0) to (1.0; 1.0) applied to a square will result in +a linear gradient from the north-western corner of the square to the +south-eastern corner. + + +A gradient from (0.5; 0.0) to (0.5; 1.0) applied to a square will result in +a gradient from the top to the bottom. + + +Of course, you are not limited to the bounding box of your item. A gradient +like this can also be applied: (-0.25; 0.0) to (0.5; 1.0). + + + + + + +Details + +<anchor id="CcLinearGradient" role="typedef"/>CcLinearGradient +CcLinearGradienttypedef CcGradient CcLinearGradient; + + + + + +<anchor id="CcLinearGradientClass" role="typedef"/>CcLinearGradientClass +CcLinearGradientClasstypedef CcGradientClass CcLinearGradientClass; + + + + + +<anchor id="cc-linear-gradient-get-type" role="function"/>cc_linear_gradient_get_type () +cc_linear_gradient_get_typeGType cc_linear_gradient_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-linear-gradient-new" role="function"/>cc_linear_gradient_new () +cc_linear_gradient_newCcBrush* cc_linear_gradient_new (gdouble x1, + gdouble y1, + gdouble x2, + gdouble y2); + + + +x1 : + + +y1 : + + +x2 : + + +y2 : + + +Returns : + + + + + + + +Property Details +<anchor id="CcLinearGradient--x1"/>The "<literal>x1</literal>" property +CcLinearGradient:x1 "x1" gdouble : Read / Write +The first horizontal point.Default value: 0 + +<anchor id="CcLinearGradient--x2"/>The "<literal>x2</literal>" property +CcLinearGradient:x2 "x2" gdouble : Read / Write +The second horizontal point.Default value: 1 + +<anchor id="CcLinearGradient--y1"/>The "<literal>y1</literal>" property +CcLinearGradient:y1 "y1" gdouble : Read / Write +The first vertical point.Default value: 0 + +<anchor id="CcLinearGradient--y2"/>The "<literal>y2</literal>" property +CcLinearGradient:y2 "y2" gdouble : Read / Write +The second vertical point.Default value: 1 + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-radial-gradient.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-radial-gradient.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-radial-gradient.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-radial-gradient.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,147 @@ + + + + +cc-radial-gradient +3 +CCC Library + + + +cc-radial-gradient + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcRadialGradient; +typedef CcRadialGradientClass; +CcBrush* cc_radial_gradient_new (gdouble x, + gdouble y, + gdouble radius); +GType cc_radial_gradient_get_type (void); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcBrush + +----CcGradient + +----CcRadialGradient + + + + + + + + + +Properties + + + "radius" gdouble : Read / Write + "x" gdouble : Read / Write + "y" gdouble : Read / Write + + + + + + +Description + + + + + + +Details + +<anchor id="CcRadialGradient" role="typedef"/>CcRadialGradient +CcRadialGradienttypedef CcGradient CcRadialGradient; + + + + + +<anchor id="CcRadialGradientClass" role="typedef"/>CcRadialGradientClass +CcRadialGradientClasstypedef CcGradientClass CcRadialGradientClass; + + + + + +<anchor id="cc-radial-gradient-new" role="function"/>cc_radial_gradient_new () +cc_radial_gradient_newCcBrush* cc_radial_gradient_new (gdouble x, + gdouble y, + gdouble radius); + +Create a new radial gradient. + + +x, y and radius are given in a relation to the item's size and position: +eg. 0.5 means either "in the middle" (for x and y) or "half the size" (for +radius). + + + +x : + the x position of the gradient's center + +y : + the y position of the gradient's center + +radius : + the radius of the gradient's circle + +Returns :a new CcRadialGradient. + + + +<anchor id="cc-radial-gradient-get-type" role="function"/>cc_radial_gradient_get_type () +cc_radial_gradient_get_typeGType cc_radial_gradient_get_type (void); + + + +Returns : + + + + + + + +Property Details +<anchor id="CcRadialGradient--radius"/>The "<literal>radius</literal>" property +CcRadialGradient:radius "radius" gdouble : Read / Write +Gradient Radius.Default value: 0.5 + +<anchor id="CcRadialGradient--x"/>The "<literal>x</literal>" property +CcRadialGradient:x "x" gdouble : Read / Write +Horizontal position of the gradient center.Default value: 0.5 + +<anchor id="CcRadialGradient--y"/>The "<literal>y</literal>" property +CcRadialGradient:y "y" gdouble : Read / Write +Vertical position of the gradient center.Default value: 0.5 + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-simple-item.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-simple-item.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-simple-item.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-simple-item.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,184 @@ + + + + +Simple Item +3 +CCC Library + + + +Simple Item + + + + + +Synopsis + + + +#include <ccc/cc-simple-item.h> + + +typedef CcSimpleItem; +typedef CcSimpleItemClass; +CcItem* cc_simple_item_new (void); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcSimpleItem + + + + + + + +Implemented Interfaces + +CcSimpleItem implements + CcItemView. + + + + + + +Signals + + + "distance" + "render" + "update-bounds" + + + + + +Description + + + + + + +Details + +<anchor id="CcSimpleItem" role="typedef"/>CcSimpleItem +CcSimpleItemtypedef CcItem CcSimpleItem; + + + + + +<anchor id="CcSimpleItemClass" role="typedef"/>CcSimpleItemClass +CcSimpleItemClasstypedef CcItemClass CcSimpleItemClass; + + + + + +<anchor id="cc-simple-item-new" role="function"/>cc_simple_item_new () +cc_simple_item_newCcItem* cc_simple_item_new (void); + +Creates a new item for rapid prototyping. + + + +Returns :a new CcItem. + + + + + + +Signal Details +<anchor id="CcSimpleItem-distance"/>The "distance" signal +CcSimpleItem::distancegdouble user_function (CcSimpleItem *self, + CcView *view, + gdouble x, + gdouble y, + gpointer retval, + gpointer user_data) + +Hit-Test an item. This signal gets emitted when the view is trying +to locate an item at a specific position. See also . + + + +self : + the CcSimpleItem which received the signal + +view : + the CcView where the signal was received + +x : + the horizontal coordinate of the tested point + +y : + the vertical coordinate of the tested point + +retval : + a return location for a hit item + +user_data : +user data set when the signal handler was connected. +Returns :the distance of (x, y) to self. + +<anchor id="CcSimpleItem-render"/>The "render" signal +CcSimpleItem::rendervoid user_function (CcSimpleItem *self, + CcView *view, + CcCairo *cairo, + gpointer user_data) + +Render the simple item to a view. See also . + + + +self : + a CcSimpleItem + +view : + a CcView + +cairo : + a cairo_t for rendering + +user_data : +user data set when the signal handler was connected. +<anchor id="CcSimpleItem-update-bounds"/>The "update-bounds" signal +CcSimpleItem::update-boundsvoid user_function (CcSimpleItem *self, + CcView *view, + gpointer user_data) + +Update the bounding box for a view. See also . + + + +self : + a CcSimpleItem + +view : + a CcView + +user_data : +user data set when the signal handler was connected. + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-unit.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-unit.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/cc-unit.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/cc-unit.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,161 @@ + + + + +Resolution Independence +3 +CCC Library + + + +Resolution Independence + + + + + +Synopsis + + + +#include <ccc/cc-unit.h> + + + CcDistance; +enum CcUnit; +CcDistance* cc_distance_new (gdouble value, + CcUnit unit); +CcDistance* cc_distance_copy (CcDistance const*self); +void cc_distance_free (CcDistance *self); + + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="CcDistance" role="struct"/>CcDistance +CcDistancetypedef struct { +} CcDistance; + + +CcDistance represents a one-dimensional length measured in a certain unit. +You shouldn't access the attributes directly. + + + + +<anchor id="CcUnit" role="enum"/>enum CcUnit +CcUnittypedef enum { + /* relative sizes */ + CC_UNIT_DISPLAY_PIXEL, + /* EM */ + /* EX */ + /* CC_UNIT_PIXEL, */ + /* GD */ + /* REM */ + /* VW */ + /* VH */ + /* VM */ + /* CH */ + /* absolute size */ + /* IN */ + /* CM */ + /* MM */ + CC_UNIT_POINT, + /* PC */ + /* aliases */ + /* CC_UNIT_PX = CC_UNIT_PIXEL, */ + CC_UNIT_PT = CC_UNIT_POINT +} CcUnit; + + +CcUnit represents a length unit. It is used to represent sizes that are not +given in pixels. It's also very useful for resolution-independent rendering +of sizes and positions. + + + + +CC_UNIT_DISPLAY_PIXEL + + + + +CC_UNIT_POINT + 1/72 of an inch + + + +CC_UNIT_PT + an alias for CC_UNIT_POINT + + + + +<anchor id="cc-distance-new" role="function"/>cc_distance_new () +cc_distance_newCcDistance* cc_distance_new (gdouble value, + CcUnit unit); + +Create a new distance representation. + + + +value : + the size + +unit : + the unit belonging to the size + +Returns :a newly allocated CcDistance. + + + +<anchor id="cc-distance-copy" role="function"/>cc_distance_copy () +cc_distance_copyCcDistance* cc_distance_copy (CcDistance const*self); + +Create a new CcDistance by copying another. + + + +self : + a CcDistance + +Returns :a copy of self. + + + +<anchor id="cc-distance-free" role="function"/>cc_distance_free () +cc_distance_freevoid cc_distance_free (CcDistance *self); + +Free the memory that was occupied by self. + + + +self : + a CcDistance + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/circle.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/circle.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/circle.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/circle.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,173 @@ + + + + +circle +3 +CCC Library + + + +circle + + + + + +Synopsis + + + +#include <ccc.h> + + + CcCircle; + CcCircleClass; +GType cc_circle_get_type (void); +CcItem* cc_circle_new (void); +void cc_circle_set_anchor (CcCircle *self, + gdouble x, + gdouble y); +void cc_circle_set_radius (CcCircle *self, + gdouble radius); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcShape + +----CcCircle + + + + + + + +Implemented Interfaces + +CcCircle implements + CcItemView. + + + + + +Properties + + + "anchor" gpointer : + "radius" gdouble : Read / Write + + + + + + +Description + + + + + + +Details + +<anchor id="CcCircle-struct" role="struct"/>CcCircle +CcCircletypedef struct _CcCircle CcCircle; + + + + +<anchor id="CcCircleClass" role="struct"/>CcCircleClass +CcCircleClasstypedef struct { + CcShapeClass base_class; +} CcCircleClass; + + + + + +<anchor id="cc-circle-get-type" role="function"/>cc_circle_get_type () +cc_circle_get_typeGType cc_circle_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-circle-new" role="function"/>cc_circle_new () +cc_circle_newCcItem* cc_circle_new (void); + + + +Returns : + + + + + +<anchor id="cc-circle-set-anchor" role="function"/>cc_circle_set_anchor () +cc_circle_set_anchorvoid cc_circle_set_anchor (CcCircle *self, + gdouble x, + gdouble y); + + + +self : + + +x : + + +y : + + + + + + +<anchor id="cc-circle-set-radius" role="function"/>cc_circle_set_radius () +cc_circle_set_radiusvoid cc_circle_set_radius (CcCircle *self, + gdouble radius); + +Specifies the radius of the circle. + + + +self : + a CcCircle + +radius : + the new radius + + + + + +Property Details +<anchor id="CcCircle--anchor"/>The "<literal>anchor</literal>" property +CcCircle:anchor "anchor" gpointer : +The center of the circle. +<anchor id="CcCircle--radius"/>The "<literal>radius</literal>" property +CcCircle:radius "radius" gdouble : Read / Write +Radius.Allowed values: >= 0 +Default value: 0 + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/color.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/color.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/color.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/color.xml 2007-05-05 23:29:44.000000000 +0100 @@ -16,29 +16,38 @@ Synopsis - + +#include <ccc.h> - CcColor; - CcColorClass; -CcColor* cc_color_new_hsv (gdouble hue, - gdouble saturation, - gdouble value); -CcColor* cc_color_new_hsva (gdouble hue, - gdouble saturation, - gdouble value, - gdouble alpha); -CcColor* cc_color_new_rgb (gdouble red, - gdouble green, - gdouble blue); -CcColor* cc_color_new_rgba (gdouble red, - gdouble green, - gdouble blue, - gdouble alpha); -void cc_color_apply (CcColor *self, - cairo_t *cr); + CcColor; +typedef CcColorRgb; +typedef CcColorHsv; + CcColorClass; +CcColor* cc_color_new_hsv (gdouble hue, + gdouble saturation, + gdouble value); +CcColor* cc_color_new_hsva (gdouble hue, + gdouble saturation, + gdouble value, + gdouble alpha); +CcColor* cc_color_new_rgb (gdouble red, + gdouble green, + gdouble blue); +CcColor* cc_color_new_rgba (gdouble red, + gdouble green, + gdouble blue, + gdouble alpha); +void cc_color_apply (CcColor const *self, + gdouble *red, + gdouble *green, + gdouble *blue, + gdouble *alpha); +void cc_color_stop (CcColor const *self, + cairo_pattern_t *pattern, + gdouble offset); @@ -50,6 +59,22 @@ GObject +----GInitiallyUnowned +----CcColor + +----CcColorHsv + +----CcColorRgb + + + + GObject + +----GInitiallyUnowned + +----CcColor + +----CcColorRgb + + + + GObject + +----GInitiallyUnowned + +----CcColor + +----CcColorHsv @@ -62,7 +87,13 @@ Properties - "alpha" gdouble : Read / Write / Construct + "alpha" gdouble : Read / Write / Construct + "blue" gdouble : Read / Write / Construct + "green" gdouble : Read / Write / Construct + "red" gdouble : Read / Write / Construct + "hue" gdouble : Read / Write / Construct + "saturation" gdouble : Read / Write / Construct + "value" gdouble : Read / Write / Construct @@ -84,13 +115,30 @@ +<anchor id="CcColorRgb" role="typedef"/>CcColorRgb +CcColorRgbtypedef CcColor CcColorRgb; + + + + + +<anchor id="CcColorHsv" role="typedef"/>CcColorHsv +CcColorHsvtypedef CcColor CcColorHsv; + + + + + <anchor id="CcColorClass" role="struct"/>CcColorClass CcColorClasstypedef struct { GInitiallyUnownedClass base_class; /* vtable */ void (*apply) (CcColor const* self, - cairo_t * cr); + gdouble * red, + gdouble * green, + gdouble * blue, + gdouble * alpha); } CcColorClass; @@ -98,9 +146,9 @@ <anchor id="cc-color-new-hsv" role="function"/>cc_color_new_hsv () -cc_color_new_hsvCcColor* cc_color_new_hsv (gdouble hue, - gdouble saturation, - gdouble value); +cc_color_new_hsvCcColor* cc_color_new_hsv (gdouble hue, + gdouble saturation, + gdouble value); @@ -120,10 +168,10 @@ <anchor id="cc-color-new-hsva" role="function"/>cc_color_new_hsva () -cc_color_new_hsvaCcColor* cc_color_new_hsva (gdouble hue, - gdouble saturation, - gdouble value, - gdouble alpha); +cc_color_new_hsvaCcColor* cc_color_new_hsva (gdouble hue, + gdouble saturation, + gdouble value, + gdouble alpha); @@ -146,9 +194,9 @@ <anchor id="cc-color-new-rgb" role="function"/>cc_color_new_rgb () -cc_color_new_rgbCcColor* cc_color_new_rgb (gdouble red, - gdouble green, - gdouble blue); +cc_color_new_rgbCcColor* cc_color_new_rgb (gdouble red, + gdouble green, + gdouble blue); @@ -168,10 +216,10 @@ <anchor id="cc-color-new-rgba" role="function"/>cc_color_new_rgba () -cc_color_new_rgbaCcColor* cc_color_new_rgba (gdouble red, - gdouble green, - gdouble blue, - gdouble alpha); +cc_color_new_rgbaCcColor* cc_color_new_rgba (gdouble red, + gdouble green, + gdouble blue, + gdouble alpha); @@ -194,18 +242,51 @@ <anchor id="cc-color-apply" role="function"/>cc_color_apply () -cc_color_applyvoid cc_color_apply (CcColor *self, - cairo_t *cr); +cc_color_applyvoid cc_color_apply (CcColor const *self, + gdouble *red, + gdouble *green, + gdouble *blue, + gdouble *alpha); + +Initializes red, green, blue and alpha to represent the color specified +by self: self : - + a CcColor -cr : - - +red : + target for red component + +green : + target for green component + +blue : + target for blue component + +alpha : + target for alpha value + + + +<anchor id="cc-color-stop" role="function"/>cc_color_stop () +cc_color_stopvoid cc_color_stop (CcColor const *self, + cairo_pattern_t *pattern, + gdouble offset); + +Specify a color stop in pattern at offset with the color of self. + + +self : + a CcColor + +pattern : + a cairo_pattern_t + +offset : + [0.0..1.0] @@ -213,10 +294,40 @@ Property Details <anchor id="CcColor--alpha"/>The "<literal>alpha</literal>" property -CcColor:alpha "alpha" gdouble : Read / Write / Construct +CcColor:alpha "alpha" gdouble : Read / Write / Construct Alpha.Allowed values: [0,1] Default value: 1 +<anchor id="CcColorRgb--blue"/>The "<literal>blue</literal>" property +CcColorRgb:blue "blue" gdouble : Read / Write / Construct +Blue.Allowed values: [0,1] +Default value: 1 + +<anchor id="CcColorRgb--green"/>The "<literal>green</literal>" property +CcColorRgb:green "green" gdouble : Read / Write / Construct +Green.Allowed values: [0,1] +Default value: 1 + +<anchor id="CcColorRgb--red"/>The "<literal>red</literal>" property +CcColorRgb:red "red" gdouble : Read / Write / Construct +Red.Allowed values: [0,1] +Default value: 1 + +<anchor id="CcColorHsv--hue"/>The "<literal>hue</literal>" property +CcColorHsv:hue "hue" gdouble : Read / Write / Construct +Hue.Allowed values: [0,1] +Default value: 0 + +<anchor id="CcColorHsv--saturation"/>The "<literal>saturation</literal>" property +CcColorHsv:saturation "saturation" gdouble : Read / Write / Construct +Saturation.Allowed values: [0,1] +Default value: 0 + +<anchor id="CcColorHsv--value"/>The "<literal>value</literal>" property +CcColorHsv:value "value" gdouble : Read / Write / Construct +Value.Allowed values: [0,1] +Default value: 1 + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/d-rect.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/d-rect.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/d-rect.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/d-rect.xml 2007-05-05 23:29:44.000000000 +0100 @@ -19,17 +19,18 @@ +#include <ccc.h> - CcDRect; -CcDRect* cc_d_rect_copy (CcDRect *one); -gboolean cc_d_rect_equal (CcDRect one, - CcDRect two); -gboolean cc_d_rect_intersect (CcDRect one, - CcDRect two); -void cc_d_rect_union (CcDRect one, - CcDRect two, - CcDRect *merged); + CcDRect; +CcDRect* cc_d_rect_copy (CcDRect const*one); +gboolean cc_d_rect_equal (CcDRect one, + CcDRect two); +gboolean cc_d_rect_intersect (CcDRect one, + CcDRect two); +void cc_d_rect_union (CcDRect one, + CcDRect two, + CcDRect *merged); @@ -65,7 +66,7 @@ <anchor id="cc-d-rect-copy" role="function"/>cc_d_rect_copy () -cc_d_rect_copyCcDRect* cc_d_rect_copy (CcDRect *one); +cc_d_rect_copyCcDRect* cc_d_rect_copy (CcDRect const*one); @@ -79,8 +80,8 @@ <anchor id="cc-d-rect-equal" role="function"/>cc_d_rect_equal () -cc_d_rect_equalgboolean cc_d_rect_equal (CcDRect one, - CcDRect two); +cc_d_rect_equalgboolean cc_d_rect_equal (CcDRect one, + CcDRect two); @@ -97,8 +98,8 @@ <anchor id="cc-d-rect-intersect" role="function"/>cc_d_rect_intersect () -cc_d_rect_intersectgboolean cc_d_rect_intersect (CcDRect one, - CcDRect two); +cc_d_rect_intersectgboolean cc_d_rect_intersect (CcDRect one, + CcDRect two); @@ -115,9 +116,9 @@ <anchor id="cc-d-rect-union" role="function"/>cc_d_rect_union () -cc_d_rect_unionvoid cc_d_rect_union (CcDRect one, - CcDRect two, - CcDRect *merged); +cc_d_rect_unionvoid cc_d_rect_union (CcDRect one, + CcDRect two, + CcDRect *merged); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/hashmap.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/hashmap.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/hashmap.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/hashmap.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,171 @@ + + + + +hashmap +3 +CCC Library + + + +hashmap + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcHashMap; +void cc_hash_map_foreach (CcHashMap *self, + GHFunc func, + gpointer user_data); +GType cc_hash_map_get_type (void); +void cc_hash_map_insert (CCHashMap *self, + gpointer key, + gpointer data); +gpointer cc_hash_map_lookup (CcHashMap *self, + gconstpointer key); +CcHashMap* cc_hash_map_new (GType content_type); +void cc_hash_map_remove (CCHashMap *self, + gconstpointer key); + + + + + + + + + + + + + +Description + + + + + + +Details + +<anchor id="CcHashMap" role="typedef"/>CcHashMap +CcHashMaptypedef struct _CCHashMap CcHashMap; + + + + + +<anchor id="cc-hash-map-foreach" role="function"/>cc_hash_map_foreach () +cc_hash_map_foreachvoid cc_hash_map_foreach (CcHashMap *self, + GHFunc func, + gpointer user_data); + + + +self : + + +func : + + +user_data : + + + + + + +<anchor id="cc-hash-map-get-type" role="function"/>cc_hash_map_get_type () +cc_hash_map_get_typeGType cc_hash_map_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-hash-map-insert" role="function"/>cc_hash_map_insert () +cc_hash_map_insertvoid cc_hash_map_insert (CCHashMap *self, + gpointer key, + gpointer data); + + + +self : + + +key : + + +data : + + + + + + +<anchor id="cc-hash-map-lookup" role="function"/>cc_hash_map_lookup () +cc_hash_map_lookupgpointer cc_hash_map_lookup (CcHashMap *self, + gconstpointer key); + + + +self : + + +key : + + +Returns : + + + + + +<anchor id="cc-hash-map-new" role="function"/>cc_hash_map_new () +cc_hash_map_newCcHashMap* cc_hash_map_new (GType content_type); + + + +content_type : + + +Returns : + + + + + +<anchor id="cc-hash-map-remove" role="function"/>cc_hash_map_remove () +cc_hash_map_removevoid cc_hash_map_remove (CCHashMap *self, + gconstpointer key); + + + +self : + + +key : + + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/hbox-layout.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/hbox-layout.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/hbox-layout.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/hbox-layout.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,99 @@ + + + + +Box Layout (Horizontal) +3 +CCC Library + + + +Box Layout (Horizontal) +Boxed Layout (Horizontally) + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcHBoxLayout; +typedef CcHBoxLayoutClass; +CcLayout* cc_hbox_layout_new (void); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcHBoxLayout + + + + + + + +Implemented Interfaces + +CcHBoxLayout implements + CcLayout. + + + + + + + + +Description + +A CcHBoxLayout… + + + + + + +Details + +<anchor id="CcHBoxLayout" role="typedef"/>CcHBoxLayout +CcHBoxLayouttypedef struct _GObject CcHBoxLayout; + + + + + +<anchor id="CcHBoxLayoutClass" role="typedef"/>CcHBoxLayoutClass +CcHBoxLayoutClasstypedef GInitiallyUnownedClass CcHBoxLayoutClass; + + + + + +<anchor id="cc-hbox-layout-new" role="function"/>cc_hbox_layout_new () +cc_hbox_layout_newCcLayout* cc_hbox_layout_new (void); + + + +Returns : + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/item-view.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/item-view.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/item-view.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/item-view.xml 2007-05-05 23:29:44.000000000 +0100 @@ -16,24 +16,56 @@ Synopsis - + +#include <ccc.h> - CcItemViewIface; -void cc_item_view_register (CcItemView *self, - CcItem *item); -void cc_item_view_unregister (CcItemView *self, - CcItem *item); + CcItemView; + CcItemViewIface; +void cc_item_view_register (CcItemView *self, + CcItem *item); +void cc_item_view_unregister (CcItemView *self, + CcItem *item); + +Object Hierarchy + + GInterface + +----CcItemView + + + + +Prerequisites + +CcItemView requires + GObject. + + +Known Derived Interfaces + +CcItemView is required by + CcView. + + + + + +Known Implementations + +CcItemView is implemented by + CcSimpleItem, CcCamera, CcText, CcShape, CcItem, CcViewCellRenderer, CcPixbuf, CcCaret, CcLine, CcRoundedRectangle, CcViewWidget, CcCircle and CcRectangle. + + @@ -48,6 +80,12 @@ Details +<anchor id="CcItemView-struct" role="struct"/>CcItemView +CcItemViewtypedef struct _CcItemView CcItemView; + + + + <anchor id="CcItemViewIface" role="struct"/>CcItemViewIface CcItemViewIfacetypedef struct { GTypeInterface base_iface; @@ -76,8 +114,8 @@ <anchor id="cc-item-view-register" role="function"/>cc_item_view_register () -cc_item_view_registervoid cc_item_view_register (CcItemView *self, - CcItem *item); +cc_item_view_registervoid cc_item_view_register (CcItemView *self, + CcItem *item); @@ -92,8 +130,8 @@ <anchor id="cc-item-view-unregister" role="function"/>cc_item_view_unregister () -cc_item_view_unregistervoid cc_item_view_unregister (CcItemView *self, - CcItem *item); +cc_item_view_unregistervoid cc_item_view_unregister (CcItemView *self, + CcItem *item); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/item.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/item.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/item.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/item.xml 2007-05-05 23:29:44.000000000 +0100 @@ -19,36 +19,78 @@ +#include <ccc.h> - CcItem; - CcItemClass; -CcItem* cc_item_new (void); -void cc_item_append (CcItem *self, - CcItem *child); -void cc_item_dirty (CcItem *self, - CcView const*view, - CcDRect dirty_region); -gdouble cc_item_distance (CcItem *self, - gdouble x, - gdouble y, - CcItem **found); -void cc_item_insert (CcItem *self, - CcItem *child, - gint position); -void cc_item_remove (CcItem *self, - CcItem *child); -void cc_item_render (CcItem *self, - CcView *view, - cairo_t *cr); -void cc_item_set_grid_aligned (CcItem *self, - gboolean grid_aligned); -enum CcItemFlags; -#define CC_ITEM_FLAGS (i) -#define CC_ITEM_DISPOSED (i) -#define CC_ITEM_GRID_ALIGNED (i) -#define CC_ITEM_SET_FLAGS (i,m) -#define CC_ITEM_UNSET_FLAGS (i,m) + CcItem; + CcItemClass; +void cc_item_class_add_view_data (gpointer item_class, + gsize view_data_size); +gpointer cc_item_get_view_data (CcItem const*self, + CcView const*view, + GType type); +CcItem* cc_item_new (void); +void cc_item_append (CcItem *self, + CcItem *child); +void cc_item_dirty (CcItem *self, + CcView const*view, + CcDRect dirty_region); +gdouble cc_item_distance (CcItem *self, + CcView const*view, + gdouble x, + gdouble y, + CcItem **found); +void cc_item_insert (CcItem *self, + CcItem *child, + gint position); +void cc_item_remove (CcItem *self, + CcItem *child); +void cc_item_render (CcItem *self, + CcView *view, + cairo_t *cr); +void cc_item_set_grid_aligned (CcItem *self, + gboolean grid_aligned); +void cc_item_lower (CcItem *child, + CcItem *parent); +void cc_item_lower_to_bottom (CcItem *child, + CcItem *parent); +void cc_item_raise (CcItem *child, + CcItem *parent); +void cc_item_raise_to_top (CcItem *child, + CcItem *parent); +void cc_item_set_position (CcItem *child, + CcItem *parent, + gint position); +enum CcItemFlags; +#define CC_ITEM_FLAGS (i) +#define CC_ITEM_DISPOSED (i) +#define CC_ITEM_GRID_ALIGNED (i) +#define CC_ITEM_SET_FLAGS (i,m) +#define CC_ITEM_UNSET_FLAGS (i,m) +#define CC_ITEM_CAN_FOCUS (i) +void (*CcItemFunc) (CcItem *item, + CcView *view, + gpointer data); +void cc_item_add_view (CcItem *self, + CcView *view); +void cc_item_bounds_changed (CcItem *self, + CcView const*view); +GType cc_item_flags_get_type (void); +void cc_item_foreach_view (CcItem *self, + CcItemFunc func, + gpointer data); +CcDRectconst* cc_item_get_all_bounds (CcItem const*self, + CcView const*view); +void cc_item_grab_focus (CcItem *self, + CcView *view); +gboolean cc_item_is_child_of (CcItem const*child, + CcItem const*parent); +void cc_item_remove_view (CcItem *self, + CcView *view); +void cc_item_update_bounds (CcItem *self, + gpointer data); +void cc_item_update_bounds_for_view (CcItem *self, + CcView *view); @@ -60,7 +102,10 @@ GObject +----GInitiallyUnowned +----CcItem + +----CcCamera +----CcShape + +----CcPixbuf + +----CcSimpleItem @@ -71,7 +116,7 @@ Implemented Interfaces CcItem implements - + CcItemView. @@ -81,86 +126,23 @@ Signals -"all-bounds-changed" - void user_function (CcItem *ccitem, - CcView *arg1, - CcDRect *arg2, - gpointer user_data) : -"button-press-event" - gboolean user_function (CcItem *self, - CcView *view, - GdkEventButton *event, - gpointer user_data) : Run last -"button-release-event" - gboolean user_function (CcItem *self, - CcView *view, - GdkEventButton *event, - gpointer user_data) : Run last -"dirty" void user_function (CcItem *self, - CcView *dirty_region, - CcDRect *arg2, - gpointer user_data) : -"enter-notify-event" - gboolean user_function (CcItem *self, - CcView *view, - GdkEventCrossing *event, - gpointer user_data) : Run last -"event" gboolean user_function (CcItem *self, - CcView *view, - GdkEvent *event, - gpointer user_data) : Run last -"focus" gboolean user_function (CcItem *self, - CcView *view, - GtkDirectionType *dir, - gpointer user_data) : Run last -"focus-enter" - gboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEvent *event, - gpointer user_data) : Run last -"focus-leave" - gboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEvent *event, - gpointer user_data) : Run last -"item-added" - void user_function (CcItem *self, - gint position, - CcItem *child, - gpointer user_data) : Run last -"item-removed" - void user_function (CcItem *self, - gint position, - CcItem *child, - gpointer user_data) : Run last -"key-press-event" - gboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEventKey *event, - gpointer user_data) : Run last -"key-release-event" - gboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEventKey *event, - gpointer user_data) : Run last -"leave-notify-event" - gboolean user_function (CcItem *self, - CcView *view, - GdkEventCrossing *event, - gpointer user_data) : Run last -"motion-notify-event" - gboolean user_function (CcItem *self, - CcView *view, - GdkEventMotion *event, - gpointer user_data) : Run last -"view-register" - void user_function (CcItem *self, - CcView *view, - gpointer user_data) : Run first -"view-unregister" - void user_function (CcItem *self, - CcView *view, - gpointer user_data) : Run last + "all-bounds-changed" + "button-press-event" : Run Last + "button-release-event" : Run Last + "dirty" + "enter-notify-event" : Run Last + "event" : Run Last + "focus" : Run Last + "focus-enter" : Run Last + "focus-leave" : Run Last + "item-added" : Run Last + "item-removed" : Run Last + "key-press-event" : Run Last + "key-release-event" : Run Last + "leave-notify-event" : Run Last + "motion-notify-event" : Run Last + "view-register" : Run First + "view-unregister" : Run Last @@ -187,6 +169,7 @@ /* vtable */ gdouble (*distance) (CcItem * self, + CcView const * view, gdouble x, gdouble y, CcItem **found); @@ -253,8 +236,48 @@ +<anchor id="cc-item-class-add-view-data" role="function"/>cc_item_class_add_view_data () +cc_item_class_add_view_datavoid cc_item_class_add_view_data (gpointer item_class, + gsize view_data_size); + +Registers the size of view data for a certain item class. See also +. + + + +item_class : + a CcItemClass + +view_data_size : + the size to be allocated for the view data + + + +<anchor id="cc-item-get-view-data" role="function"/>cc_item_get_view_data () +cc_item_get_view_datagpointer cc_item_get_view_data (CcItem const*self, + CcView const*view, + GType type); + +Get a pointer to the view data for view in self. See also +. + + + +self : + a CcItem + +view : + a CcView + +type : + the GType of self which should be searched for the view + +Returns :a pointer to the requested memory. + + + <anchor id="cc-item-new" role="function"/>cc_item_new () -cc_item_newCcItem* cc_item_new (void); +cc_item_newCcItem* cc_item_new (void); Create a new CcItem that can be used to group several items together. @@ -265,8 +288,8 @@ <anchor id="cc-item-append" role="function"/>cc_item_append () -cc_item_appendvoid cc_item_append (CcItem *self, - CcItem *child); +cc_item_appendvoid cc_item_append (CcItem *self, + CcItem *child); Insert an item at the end of this item. A CcItem can serve as a container for several items. @@ -282,11 +305,11 @@ <anchor id="cc-item-dirty" role="function"/>cc_item_dirty () -cc_item_dirtyvoid cc_item_dirty (CcItem *self, - CcView const*view, - CcDRect dirty_region); +cc_item_dirtyvoid cc_item_dirty (CcItem *self, + CcView const*view, + CcDRect dirty_region); -Let emit a signal to tell all the views that it needs to be redrawn. +Let emit a signal to tell view that it needs to be redrawn. @@ -294,7 +317,7 @@ a CcItem view : - + a CcView dirty_region : the region that needs to be redrawn @@ -302,10 +325,11 @@ <anchor id="cc-item-distance" role="function"/>cc_item_distance () -cc_item_distancegdouble cc_item_distance (CcItem *self, - gdouble x, - gdouble y, - CcItem **found); +cc_item_distancegdouble cc_item_distance (CcItem *self, + CcView const*view, + gdouble x, + gdouble y, + CcItem **found); Calculates the distance from self to (x,y). If (x,y) is within self or one of its children found is set to the matching element. @@ -315,6 +339,9 @@ self : a CcItem +view : + a CcView + x : the x coordinate to query for @@ -329,9 +356,9 @@ <anchor id="cc-item-insert" role="function"/>cc_item_insert () -cc_item_insertvoid cc_item_insert (CcItem *self, - CcItem *child, - gint position); +cc_item_insertvoid cc_item_insert (CcItem *self, + CcItem *child, + gint position); Inserts child at position into self. @@ -350,8 +377,8 @@ <anchor id="cc-item-remove" role="function"/>cc_item_remove () -cc_item_removevoid cc_item_remove (CcItem *self, - CcItem *child); +cc_item_removevoid cc_item_remove (CcItem *self, + CcItem *child); Removes child from self. Does nothing if child was not a child of self or if child is a child of one of self's children. @@ -367,9 +394,9 @@ <anchor id="cc-item-render" role="function"/>cc_item_render () -cc_item_rendervoid cc_item_render (CcItem *self, - CcView *view, - cairo_t *cr); +cc_item_rendervoid cc_item_render (CcItem *self, + CcView *view, + cairo_t *cr); Renders self to cr which is supposed to be a cairo context of view as the transformation matrix of view will be used for rendering. @@ -388,8 +415,8 @@ <anchor id="cc-item-set-grid-aligned" role="function"/>cc_item_set_grid_aligned () -cc_item_set_grid_alignedvoid cc_item_set_grid_aligned (CcItem *self, - gboolean grid_aligned); +cc_item_set_grid_alignedvoid cc_item_set_grid_aligned (CcItem *self, + gboolean grid_aligned); Sets self to be rendered grid-aligned if grid_aligned is TRUE, sets it to be allowed to render fuzzyly if FALSE. @@ -404,6 +431,92 @@ +<anchor id="cc-item-lower" role="function"/>cc_item_lower () +cc_item_lowervoid cc_item_lower (CcItem *child, + CcItem *parent); + +Lowers child by one level. + + + +child : + a CcItem + +parent : + another CcItem, parent of child + + + +<anchor id="cc-item-lower-to-bottom" role="function"/>cc_item_lower_to_bottom () +cc_item_lower_to_bottomvoid cc_item_lower_to_bottom (CcItem *child, + CcItem *parent); + +Lowers child to be displayed behind all the other children of parent. + + + +child : + a CcItem + +parent : + another CcItem, parent of child + + + +<anchor id="cc-item-raise" role="function"/>cc_item_raise () +cc_item_raisevoid cc_item_raise (CcItem *child, + CcItem *parent); + +Raises child by one level. + + + +child : + a CcItem + +parent : + another CcItem, parent of child + + + +<anchor id="cc-item-raise-to-top" role="function"/>cc_item_raise_to_top () +cc_item_raise_to_topvoid cc_item_raise_to_top (CcItem *child, + CcItem *parent); + +Raises an child to the top. It will be displayed over all of the other +children of parent. + + + +child : + a CcItem + +parent : + another CcItem, parent of child + + + +<anchor id="cc-item-set-position" role="function"/>cc_item_set_position () +cc_item_set_positionvoid cc_item_set_position (CcItem *child, + CcItem *parent, + gint position); + +Changes the position of child relative to parent. + + + +child : + a CcItem + +parent : + another CcItem, parent of child + +position : + the new position of the CcItem (0 means at the bottom, +bigger numbers mean higher layers, -1 means top layer) + + + <anchor id="CcItemFlags" role="enum"/>enum CcItemFlags CcItemFlagstypedef enum { CC_CAN_FOCUS = 1 << 1, @@ -506,36 +619,245 @@ a CcItemFlags mask + +<anchor id="CC-ITEM-CAN-FOCUS:CAPS" role="macro"/>CC_ITEM_CAN_FOCUS() +CC_ITEM_CAN_FOCUS#define CC_ITEM_CAN_FOCUS(i) ((CC_ITEM_FLAGS(i) & CC_CAN_FOCUS) != 0) + + + + +i : + + + + + + +<anchor id="CcItemFunc" role="function"/>CcItemFunc () +CcItemFuncvoid (*CcItemFunc) (CcItem *item, + CcView *view, + gpointer data); + + + +item : + + +view : + + +data : + + + + + + +<anchor id="cc-item-add-view" role="function"/>cc_item_add_view () +cc_item_add_viewvoid cc_item_add_view (CcItem *self, + CcView *view); + +Registers a view at the item. The item and its children can now set up data +for this view. + + +This function should not be called by application code. Use +cc_item_view_register() instead. + + + +self : + a CcItem + +view : + a CcView + + + +<anchor id="cc-item-bounds-changed" role="function"/>cc_item_bounds_changed () +cc_item_bounds_changedvoid cc_item_bounds_changed (CcItem *self, + CcView const*view); + + + +self : + + +view : + + + + + + +<anchor id="cc-item-flags-get-type" role="function"/>cc_item_flags_get_type () +cc_item_flags_get_typeGType cc_item_flags_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-item-foreach-view" role="function"/>cc_item_foreach_view () +cc_item_foreach_viewvoid cc_item_foreach_view (CcItem *self, + CcItemFunc func, + gpointer data); + + + +self : + + +func : + + +data : + + + + + + +<anchor id="cc-item-get-all-bounds" role="function"/>cc_item_get_all_bounds () +cc_item_get_all_boundsCcDRectconst* cc_item_get_all_bounds (CcItem const*self, + CcView const*view); + +Get the bounds of self as it would e displayed by view (including all of its children). + + + +self : + a CcItem + +view : + a CcView + +Returns :the bounds of the item, may be NULL (in this case the item is not +tied visible area). + + + +<anchor id="cc-item-grab-focus" role="function"/>cc_item_grab_focus () +cc_item_grab_focusvoid cc_item_grab_focus (CcItem *self, + CcView *view); + + + +self : + + +view : + + + + + + +<anchor id="cc-item-is-child-of" role="function"/>cc_item_is_child_of () +cc_item_is_child_ofgboolean cc_item_is_child_of (CcItem const*child, + CcItem const*parent); + +Find out whether child is a child of parent. + + + +child : + a CcItem + +parent : + another CcItem + +Returns :TRUE is child is a child of parent. + + + +<anchor id="cc-item-remove-view" role="function"/>cc_item_remove_view () +cc_item_remove_viewvoid cc_item_remove_view (CcItem *self, + CcView *view); + +Unregisters a view at the item. The item and the children can now free data +kept for this view. + + +This function should not be called by application code. Use +cc_item_view_unregister() instead. + + + +self : + a CcItem + +view : + a CcView + + + +<anchor id="cc-item-update-bounds" role="function"/>cc_item_update_bounds () +cc_item_update_boundsvoid cc_item_update_bounds (CcItem *self, + gpointer data); + + + +self : + + +data : + + + + + + +<anchor id="cc-item-update-bounds-for-view" role="function"/>cc_item_update_bounds_for_view () +cc_item_update_bounds_for_viewvoid cc_item_update_bounds_for_view (CcItem *self, + CcView *view); + + + +self : + + +view : + + + + + Signal Details <anchor id="CcItem-all-bounds-changed"/>The "all-bounds-changed" signal -CcItem::all-bounds-changedvoid user_function (CcItem *ccitem, - CcView *arg1, - CcDRect *arg2, - gpointer user_data) : +CcItem::all-bounds-changedvoid user_function (CcItem *self, + CcView *view, + CcDRect *box, + gpointer user_data) + +This signal gets emitted when the total bounding box of an item +changed. See also . -ccitem : -the object which received the signal. +self : + a Ccitem -arg1 : - +view : + the CcView belonging to this event -arg2 : - - +box : + a CcDRect specifying the new bounding box user_data : user data set when the signal handler was connected. <anchor id="CcItem-button-press-event"/>The "button-press-event" signal -CcItem::button-press-eventgboolean user_function (CcItem *self, - CcView *view, - GdkEventButton *event, - gpointer user_data) : Run last +CcItem::button-press-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventButton *event, + gpointer user_data) : Run Last This signal gets emitted when a mouse button got pressed on top of an element. @@ -557,10 +879,10 @@ Returns :TRUE to stop other signal handlers from being called. <anchor id="CcItem-button-release-event"/>The "button-release-event" signal -CcItem::button-release-eventgboolean user_function (CcItem *self, - CcView *view, - GdkEventButton *event, - gpointer user_data) : Run last +CcItem::button-release-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventButton *event, + gpointer user_data) : Run Last This signal gets emitted when a mouse button got released on top of an item. @@ -582,10 +904,10 @@ Returns :TRUE to stop other signal handlers from being called. <anchor id="CcItem-dirty"/>The "dirty" signal -CcItem::dirtyvoid user_function (CcItem *self, - CcView *dirty_region, - CcDRect *arg2, - gpointer user_data) : +CcItem::dirtyvoid user_function (CcItem *self, + CcView *dirty_region, + CcDRect *arg2, + gpointer user_data) This signal gets emitted when an item changes. It's used to request redraws of the affected items. @@ -601,10 +923,10 @@ user_data : user data set when the signal handler was connected. <anchor id="CcItem-enter-notify-event"/>The "enter-notify-event" signal -CcItem::enter-notify-eventgboolean user_function (CcItem *self, - CcView *view, - GdkEventCrossing *event, - gpointer user_data) : Run last +CcItem::enter-notify-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventCrossing *event, + gpointer user_data) : Run Last This signal gets emitted when the mouse pointer enters an item. @@ -625,10 +947,10 @@ Returns :TRUE to stop other signal handlers from being invoked. <anchor id="CcItem-event"/>The "event" signal -CcItem::eventgboolean user_function (CcItem *self, - CcView *view, - GdkEvent *event, - gpointer user_data) : Run last +CcItem::eventgboolean user_function (CcItem *self, + CcView *view, + GdkEvent *event, + gpointer user_data) : Run Last This signal catches all events before they are distributes into more specified signals. @@ -649,10 +971,10 @@ Returns :TRUE to stop other signal handlers from being called. <anchor id="CcItem-focus"/>The "focus" signal -CcItem::focusgboolean user_function (CcItem *self, - CcView *view, - GtkDirectionType *dir, - gpointer user_data) : Run last +CcItem::focusgboolean user_function (CcItem *self, + CcView *view, + GtkDirectionType dir, + gpointer user_data) : Run Last This signal gets emitted when a focus event on the view happended to let focus-handling happen. @@ -674,54 +996,58 @@ as the one which lets the focus leave the canvas view) <anchor id="CcItem-focus-enter"/>The "focus-enter" signal -CcItem::focus-entergboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEvent *event, - gpointer user_data) : Run last +CcItem::focus-entergboolean user_function (CcItem *self, + CcView *view, + GdkEvent *event, + gpointer user_data) : Run Last + +This signal gets emitted when the focus enters this item. -ccitem : -the object which received the signal. +self : + a CcItem -arg1 : - +view : + a CcView event : - + a GdkEventFocus user_data : user data set when the signal handler was connected. -Returns : - +Returns :TRUE to stop other signal handlers, FALSE to allow their +execution. <anchor id="CcItem-focus-leave"/>The "focus-leave" signal -CcItem::focus-leavegboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEvent *event, - gpointer user_data) : Run last +CcItem::focus-leavegboolean user_function (CcItem *self, + CcView *view, + GdkEvent *event, + gpointer user_data) : Run Last + +This signal gets emitted when the focus leaves this item. -ccitem : -the object which received the signal. +self : + a CcItem -arg1 : - +view : + a CcView event : - + a GdkEventFocus user_data : user data set when the signal handler was connected. -Returns : - +Returns :TRUE to stop other signal handlers, FALSE to allow their +execution. <anchor id="CcItem-item-added"/>The "item-added" signal -CcItem::item-addedvoid user_function (CcItem *self, - gint position, - CcItem *child, - gpointer user_data) : Run last +CcItem::item-addedvoid user_function (CcItem *self, + gint position, + CcItem *child, + gpointer user_data) : Run Last This signal gets emitted when an element is added to another element. @@ -739,10 +1065,10 @@ user_data : user data set when the signal handler was connected. <anchor id="CcItem-item-removed"/>The "item-removed" signal -CcItem::item-removedvoid user_function (CcItem *self, - gint position, - CcItem *child, - gpointer user_data) : Run last +CcItem::item-removedvoid user_function (CcItem *self, + gint position, + CcItem *child, + gpointer user_data) : Run Last This signal gets emitted when an element is removed from another element. @@ -760,54 +1086,58 @@ user_data : user data set when the signal handler was connected. <anchor id="CcItem-key-press-event"/>The "key-press-event" signal -CcItem::key-press-eventgboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEventKey *event, - gpointer user_data) : Run last +CcItem::key-press-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventKey *event, + gpointer user_data) : Run Last + +This signal gets emitted when a key gets pressed. -ccitem : -the object which received the signal. +self : + a CcItem -arg1 : - +view : + a CcView event : - + a GdkEventKey user_data : user data set when the signal handler was connected. -Returns : - +Returns :TRUE to stop other signal handlers, FALSE to allow their +execution. <anchor id="CcItem-key-release-event"/>The "key-release-event" signal -CcItem::key-release-eventgboolean user_function (CcItem *ccitem, - CcView *arg1, - GdkEventKey *event, - gpointer user_data) : Run last +CcItem::key-release-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventKey *event, + gpointer user_data) : Run Last + +This signal gets emitted when a key gets released. -ccitem : -the object which received the signal. +self : + a CcItem -arg1 : - +view : + a CcView event : - + a GdkEventKey user_data : user data set when the signal handler was connected. -Returns : - +Returns :TRUE to stop other signal handlers, FALSE to allow their +execution. <anchor id="CcItem-leave-notify-event"/>The "leave-notify-event" signal -CcItem::leave-notify-eventgboolean user_function (CcItem *self, - CcView *view, - GdkEventCrossing *event, - gpointer user_data) : Run last +CcItem::leave-notify-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventCrossing *event, + gpointer user_data) : Run Last This signal gets emitted when the mouse pointer leaves an element. @@ -827,10 +1157,10 @@ Returns :TRUE to stop other signal handlers from being invoked. <anchor id="CcItem-motion-notify-event"/>The "motion-notify-event" signal -CcItem::motion-notify-eventgboolean user_function (CcItem *self, - CcView *view, - GdkEventMotion *event, - gpointer user_data) : Run last +CcItem::motion-notify-eventgboolean user_function (CcItem *self, + CcView *view, + GdkEventMotion *event, + gpointer user_data) : Run Last This signal gets emitted when the pointer (mouse cursor) moves while being over this item. @@ -851,9 +1181,9 @@ Returns :TRUE to stop other signal handlers from being called. <anchor id="CcItem-view-register"/>The "view-register" signal -CcItem::view-registervoid user_function (CcItem *self, - CcView *view, - gpointer user_data) : Run first +CcItem::view-registervoid user_function (CcItem *self, + CcView *view, + gpointer user_data) : Run First Registeres the view for this item. This signal can be used to create view-specific data for the CcItem. Take a look at CcText to see @@ -870,9 +1200,9 @@ user_data : user data set when the signal handler was connected. <anchor id="CcItem-view-unregister"/>The "view-unregister" signal -CcItem::view-unregistervoid user_function (CcItem *self, - CcView *view, - gpointer user_data) : Run last +CcItem::view-unregistervoid user_function (CcItem *self, + CcView *view, + gpointer user_data) : Run Last Registeres the view for this item. This signal can be used to create view-specific data for the CcItem. Take a look at CcText to see diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/layout.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/layout.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/layout.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/layout.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,350 @@ + + + + +Layout +3 +CCC Library + + + +Layout + + + + + +Synopsis + + + +#include <ccc.h> + + + CcLayout; + CcLayoutIface; +void cc_layout_child_get (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + ...); +void cc_layout_child_get_property (CcLayout *layout, + CcItem *child, + const gchar *property_name, + GValue *value); +void cc_layout_child_get_valist (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + va_list var_args); +void cc_layout_child_set (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + ...); +void cc_layout_child_set_property (CcLayout *layout, + CcItem *child, + const char *property_name, + const GValue *value); +void cc_layout_child_set_valist (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + va_list var_args); +GType cc_layout_get_type (void); +GParamSpec* cc_layout_iface_find_child_property (CcLayoutIface *iface, + const gchar *property_name); +void cc_layout_iface_install_child_property + (GObjectClass *klass, + guint property_id, + GParamSpec *pspec); +GParamSpec** cc_layout_iface_list_child_properties + (GObjectClass *klass, + guint *n_properties); + + + + + +Object Hierarchy + + + GInterface + +----CcLayout + + + + + +Prerequisites + +CcLayout requires + GInitiallyUnowned. + + + + + + +Known Implementations + +CcLayout is implemented by + CcHBoxLayout. + + + + + + + +Description + + + + + + +Details + +<anchor id="CcLayout-struct" role="struct"/>CcLayout +CcLayouttypedef struct _CcLayout CcLayout; + + + + +<anchor id="CcLayoutIface" role="struct"/>CcLayoutIface +CcLayoutIfacetypedef struct { + GTypeInterface iface; + + void (*set_child_property) (CcLayout *layout, + CcItem *child, + guint property_id, + const GValue *value, + GParamSpec *pspec); + void (*get_child_property) (CcLayout *layout, + CcItem *child, + guint property_id, + GValue *value, + GParamSpec *pspec); +} CcLayoutIface; + + + + + +<anchor id="cc-layout-child-get" role="function"/>cc_layout_child_get () +cc_layout_child_getvoid cc_layout_child_get (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + ...); + + + +layout : + + +child : + + +first_property_name : + + +... : + + + + + + +<anchor id="cc-layout-child-get-property" role="function"/>cc_layout_child_get_property () +cc_layout_child_get_propertyvoid cc_layout_child_get_property (CcLayout *layout, + CcItem *child, + const gchar *property_name, + GValue *value); + + + +layout : + + +child : + + +property_name : + + +value : + + + + + + +<anchor id="cc-layout-child-get-valist" role="function"/>cc_layout_child_get_valist () +cc_layout_child_get_valistvoid cc_layout_child_get_valist (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + va_list var_args); + + + +layout : + + +child : + + +first_property_name : + + +var_args : + + + + + + +<anchor id="cc-layout-child-set" role="function"/>cc_layout_child_set () +cc_layout_child_setvoid cc_layout_child_set (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + ...); + + + +layout : + + +child : + + +first_property_name : + + +... : + + + + + + +<anchor id="cc-layout-child-set-property" role="function"/>cc_layout_child_set_property () +cc_layout_child_set_propertyvoid cc_layout_child_set_property (CcLayout *layout, + CcItem *child, + const char *property_name, + const GValue *value); + + + +layout : + + +child : + + +property_name : + + +value : + + + + + + +<anchor id="cc-layout-child-set-valist" role="function"/>cc_layout_child_set_valist () +cc_layout_child_set_valistvoid cc_layout_child_set_valist (CcLayout *layout, + CcItem *child, + const gchar *first_property_name, + va_list var_args); + + + +layout : + + +child : + + +first_property_name : + + +var_args : + + + + + + +<anchor id="cc-layout-get-type" role="function"/>cc_layout_get_type () +cc_layout_get_typeGType cc_layout_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-layout-iface-find-child-property" role="function"/>cc_layout_iface_find_child_property () +cc_layout_iface_find_child_propertyGParamSpec* cc_layout_iface_find_child_property (CcLayoutIface *iface, + const gchar *property_name); + + + +iface : + + +property_name : + + +Returns : + + + + + +<anchor id="cc-layout-iface-install-child-property" role="function"/>cc_layout_iface_install_child_property () +cc_layout_iface_install_child_propertyvoid cc_layout_iface_install_child_property + (GObjectClass *klass, + guint property_id, + GParamSpec *pspec); + + + +klass : + + +property_id : + + +pspec : + + + + + + +<anchor id="cc-layout-iface-list-child-properties" role="function"/>cc_layout_iface_list_child_properties () +cc_layout_iface_list_child_propertiesGParamSpec** cc_layout_iface_list_child_properties + (GObjectClass *klass, + guint *n_properties); + + + +klass : + + +n_properties : + + +Returns : + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/line.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/line.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/line.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/line.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,171 @@ + + + + +line +3 +CCC Library + + + +line + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcLine; +typedef CcLineClass; +void cc_line_clear (CcLine *self); +GType cc_line_get_type (void); +void cc_line_line (CcLine *self, + gdouble x, + gdouble y); +void cc_line_move (CcLine *self, + gdouble x, + gdouble y); +CcItem* cc_line_new (void); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcShape + +----CcLine + +----CcCaret + + + + + + + +Implemented Interfaces + +CcLine implements + CcItemView. + + + + + + + + +Description + + + + + + +Details + +<anchor id="CcLine" role="typedef"/>CcLine +CcLinetypedef CcShape CcLine; + + + + + +<anchor id="CcLineClass" role="typedef"/>CcLineClass +CcLineClasstypedef CcShapeClass CcLineClass; + + + + + +<anchor id="cc-line-clear" role="function"/>cc_line_clear () +cc_line_clearvoid cc_line_clear (CcLine *self); + + + +self : + + + + + + +<anchor id="cc-line-get-type" role="function"/>cc_line_get_type () +cc_line_get_typeGType cc_line_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-line-line" role="function"/>cc_line_line () +cc_line_linevoid cc_line_line (CcLine *self, + gdouble x, + gdouble y); + + + +self : + + +x : + + +y : + + + + + + +<anchor id="cc-line-move" role="function"/>cc_line_move () +cc_line_movevoid cc_line_move (CcLine *self, + gdouble x, + gdouble y); + + + +self : + + +x : + + +y : + + + + + + +<anchor id="cc-line-new" role="function"/>cc_line_new () +cc_line_newCcItem* cc_line_new (void); + + + +Returns : + + + + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/pixbuf.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/pixbuf.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/pixbuf.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/pixbuf.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,279 @@ + + + + +pixbuf +3 +CCC Library + + + +pixbuf + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcPixbuf; +typedef CcPixbufClass; +gdouble cc_pixbuf_get_rotation (CcPixbuf const*self); +GType cc_pixbuf_get_type (void); +CcItem* cc_pixbuf_new (void); +void cc_pixbuf_set_pixbuf (CcPixbuf *self, + GdkPixbuf *pixbuf); +void cc_pixbuf_set_position (CcPixbuf *self, + gdouble x, + gdouble y, + gdouble w, + gdouble h); +void cc_pixbuf_set_rotation (CcPixbuf *self, + gdouble rotation); +void cc_pixbuf_set_position_x (CcPixbuf *self, + gdouble pos_x); +void cc_pixbuf_set_position_y (CcPixbuf *self, + gdouble pos_y); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcPixbuf + + + + + + + +Implemented Interfaces + +CcPixbuf implements + CcItemView. + + + + + +Properties + + + "pixbuf" GdkPixbuf : Read / Write + "position-h" gdouble : Read / Write + "position-h-set" gboolean : Read / Write + "position-w" gdouble : Read / Write + "position-w-set" gboolean : Read / Write + "position-x" gdouble : Read / Write + "position-y" gdouble : Read / Write + "rotation" gdouble : Read / Write + + + + + + +Description + + + + + + +Details + +<anchor id="CcPixbuf" role="typedef"/>CcPixbuf +CcPixbuftypedef CcItem CcPixbuf; + + + + + +<anchor id="CcPixbufClass" role="typedef"/>CcPixbufClass +CcPixbufClasstypedef CcItemClass CcPixbufClass; + + + + + +<anchor id="cc-pixbuf-get-rotation" role="function"/>cc_pixbuf_get_rotation () +cc_pixbuf_get_rotationgdouble cc_pixbuf_get_rotation (CcPixbuf const*self); + + + +self : + + +Returns : + + + + + +<anchor id="cc-pixbuf-get-type" role="function"/>cc_pixbuf_get_type () +cc_pixbuf_get_typeGType cc_pixbuf_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-pixbuf-new" role="function"/>cc_pixbuf_new () +cc_pixbuf_newCcItem* cc_pixbuf_new (void); + + + +Returns : + + + + + +<anchor id="cc-pixbuf-set-pixbuf" role="function"/>cc_pixbuf_set_pixbuf () +cc_pixbuf_set_pixbufvoid cc_pixbuf_set_pixbuf (CcPixbuf *self, + GdkPixbuf *pixbuf); + + + +self : + + +pixbuf : + + + + + + +<anchor id="cc-pixbuf-set-position" role="function"/>cc_pixbuf_set_position () +cc_pixbuf_set_positionvoid cc_pixbuf_set_position (CcPixbuf *self, + gdouble x, + gdouble y, + gdouble w, + gdouble h); + + + +self : + + +x : + + +y : + + +w : + + +h : + + + + + + +<anchor id="cc-pixbuf-set-rotation" role="function"/>cc_pixbuf_set_rotation () +cc_pixbuf_set_rotationvoid cc_pixbuf_set_rotation (CcPixbuf *self, + gdouble rotation); + + + +self : + + +rotation : + + + + + + +<anchor id="cc-pixbuf-set-position-x" role="function"/>cc_pixbuf_set_position_x () +cc_pixbuf_set_position_xvoid cc_pixbuf_set_position_x (CcPixbuf *self, + gdouble pos_x); + + + +self : + + +pos_x : + + + + + + +<anchor id="cc-pixbuf-set-position-y" role="function"/>cc_pixbuf_set_position_y () +cc_pixbuf_set_position_yvoid cc_pixbuf_set_position_y (CcPixbuf *self, + gdouble pos_y); + + + +self : + + +pos_y : + + + + + + + + +Property Details +<anchor id="CcPixbuf--pixbuf"/>The "<literal>pixbuf</literal>" property +CcPixbuf:pixbuf "pixbuf" GdkPixbuf : Read / Write +pixbuf. +<anchor id="CcPixbuf--position-h"/>The "<literal>position-h</literal>" property +CcPixbuf:position-h "position-h" gdouble : Read / Write +The height of the image.Default value: 0 + +<anchor id="CcPixbuf--position-h-set"/>The "<literal>position-h-set</literal>" property +CcPixbuf:position-h-set "position-h-set" gboolean : Read / Write +Use the specified height instead of the image height.Default value: FALSE + +<anchor id="CcPixbuf--position-w"/>The "<literal>position-w</literal>" property +CcPixbuf:position-w "position-w" gdouble : Read / Write +The width of the image.Default value: 0 + +<anchor id="CcPixbuf--position-w-set"/>The "<literal>position-w-set</literal>" property +CcPixbuf:position-w-set "position-w-set" gboolean : Read / Write +Use the specified width instead of the image width.Default value: FALSE + +<anchor id="CcPixbuf--position-x"/>The "<literal>position-x</literal>" property +CcPixbuf:position-x "position-x" gdouble : Read / Write +The horizontal position of the pixbuf.Default value: 0 + +<anchor id="CcPixbuf--position-y"/>The "<literal>position-y</literal>" property +CcPixbuf:position-y "position-y" gdouble : Read / Write +The vertical position of the pixbuf.Default value: 0 + +<anchor id="CcPixbuf--rotation"/>The "<literal>rotation</literal>" property +CcPixbuf:rotation "rotation" gdouble : Read / Write +The rotation of this image.Default value: 0 + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/png-writer.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/png-writer.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/png-writer.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/png-writer.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,121 @@ + + + + +png-writer +3 +CCC Library + + + +png-writer + + + + + +Synopsis + + + +#include <ccc.h> + + + CcViewPNG; + CcViewPNGClass; +GType cc_view_png_get_type (void); +CcView* cc_view_png_new (gchar const*filename); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcViewPNG + + + + + + + + + +Properties + + + "filename" gchararray : Read / Write / Construct Only + + + + + + +Description + + + + + + +Details + +<anchor id="CcViewPNG-struct" role="struct"/>CcViewPNG +CcViewPNGtypedef struct _CcViewPNG CcViewPNG; + + + + +<anchor id="CcViewPNGClass" role="struct"/>CcViewPNGClass +CcViewPNGClasstypedef struct { + GInitiallyUnownedClass base_class; +} CcViewPNGClass; + + + + + +<anchor id="cc-view-png-get-type" role="function"/>cc_view_png_get_type () +cc_view_png_get_typeGType cc_view_png_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-view-png-new" role="function"/>cc_view_png_new () +cc_view_png_newCcView* cc_view_png_new (gchar const*filename); + + + +filename : + + +Returns : + + + + + + + +Property Details +<anchor id="CcViewPNG--filename"/>The "<literal>filename</literal>" property +CcViewPNG:filename "filename" gchararray : Read / Write / Construct Only +Filename.Default value: NULL + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/printer.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/printer.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/printer.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/printer.xml 2007-05-05 23:29:44.000000000 +0100 @@ -0,0 +1,134 @@ + + + + +printer +3 +CCC Library + + + +printer + + + + + +Synopsis + + + +#include <ccc.h> + + + CcPrinter; + CcPrinterClass; +GType cc_printer_get_type (void); +CcPrinter* cc_printer_new (gchar const*filename); +void cc_printer_print_page (CcPrinter *self); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcPrinter + + + + + + + + + +Properties + + + "filename" gchararray : Read / Write + + + + + + +Description + + + + + + +Details + +<anchor id="CcPrinter-struct" role="struct"/>CcPrinter +CcPrintertypedef struct _CcPrinter CcPrinter; + + + + +<anchor id="CcPrinterClass" role="struct"/>CcPrinterClass +CcPrinterClasstypedef struct { + GInitiallyUnownedClass base_class; +} CcPrinterClass; + + + + + +<anchor id="cc-printer-get-type" role="function"/>cc_printer_get_type () +cc_printer_get_typeGType cc_printer_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-printer-new" role="function"/>cc_printer_new () +cc_printer_newCcPrinter* cc_printer_new (gchar const*filename); + + + +filename : + + +Returns : + + + + + +<anchor id="cc-printer-print-page" role="function"/>cc_printer_print_page () +cc_printer_print_pagevoid cc_printer_print_page (CcPrinter *self); + + + +self : + + + + + + + + +Property Details +<anchor id="CcPrinter--filename"/>The "<literal>filename</literal>" property +CcPrinter:filename "filename" gchararray : Read / Write +The name of the output file.Default value: "output.pdf" + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/rectangle.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/rectangle.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/rectangle.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/rectangle.xml 2007-05-05 23:29:45.000000000 +0100 @@ -19,16 +19,25 @@ +#include <ccc.h> - CcRectangle; - CcRectangleClass; -CcItem* cc_rectangle_new (void); -void cc_rectangle_set_position (CcRectangle *self, - gdouble x, - gdouble y, - gdouble w, - gdouble h); + CcRectangle; + CcRectangleClass; +CcItem* cc_rectangle_new (void); +void cc_rectangle_set_position (CcRectangle *self, + gdouble x, + gdouble y, + gdouble w, + gdouble h); +void cc_rectangle_set_height (CcRectangle *self, + gdouble height); +void cc_rectangle_set_width (CcRectangle *self, + gdouble width); +void cc_rectangle_set_x (CcRectangle *self, + gdouble x); +void cc_rectangle_set_y (CcRectangle *self, + gdouble y); @@ -42,6 +51,7 @@ +----CcItem +----CcShape +----CcRectangle + +----CcRoundedRectangle @@ -52,7 +62,7 @@ Implemented Interfaces CcRectangle implements - + CcItemView. @@ -61,10 +71,10 @@ Properties - "position-h" gdouble : Read / Write - "position-w" gdouble : Read / Write - "position-x" gdouble : Read / Write - "position-y" gdouble : Read / Write + "position-h" gdouble : Read / Write + "position-w" gdouble : Read / Write + "position-x" gdouble : Read / Write + "position-y" gdouble : Read / Write @@ -96,7 +106,7 @@ <anchor id="cc-rectangle-new" role="function"/>cc_rectangle_new () -cc_rectangle_newCcItem* cc_rectangle_new (void); +cc_rectangle_newCcItem* cc_rectangle_new (void); @@ -107,27 +117,91 @@ <anchor id="cc-rectangle-set-position" role="function"/>cc_rectangle_set_position () -cc_rectangle_set_positionvoid cc_rectangle_set_position (CcRectangle *self, - gdouble x, - gdouble y, - gdouble w, - gdouble h); +cc_rectangle_set_positionvoid cc_rectangle_set_position (CcRectangle *self, + gdouble x, + gdouble y, + gdouble w, + gdouble h); + +Specify the position of a rectangle. self : - + a CcRectangle x : - + the horizontal position y : - + the vertical position w : - + the width of the rectangle h : + the eight of the rectangle + + + +<anchor id="cc-rectangle-set-height" role="function"/>cc_rectangle_set_height () +cc_rectangle_set_heightvoid cc_rectangle_set_height (CcRectangle *self, + gdouble height); + + + +self : + + +height : + + + + + + +<anchor id="cc-rectangle-set-width" role="function"/>cc_rectangle_set_width () +cc_rectangle_set_widthvoid cc_rectangle_set_width (CcRectangle *self, + gdouble width); + + + +self : + + +width : + + + + + + +<anchor id="cc-rectangle-set-x" role="function"/>cc_rectangle_set_x () +cc_rectangle_set_xvoid cc_rectangle_set_x (CcRectangle *self, + gdouble x); + + + +self : + + +x : + + + + + + +<anchor id="cc-rectangle-set-y" role="function"/>cc_rectangle_set_y () +cc_rectangle_set_yvoid cc_rectangle_set_y (CcRectangle *self, + gdouble y); + + + +self : + + +y : @@ -138,19 +212,19 @@ Property Details <anchor id="CcRectangle--position-h"/>The "<literal>position-h</literal>" property -CcRectangle:position-h "position-h" gdouble : Read / Write +CcRectangle:position-h "position-h" gdouble : Read / Write The height of the rectangle.Default value: 0 <anchor id="CcRectangle--position-w"/>The "<literal>position-w</literal>" property -CcRectangle:position-w "position-w" gdouble : Read / Write +CcRectangle:position-w "position-w" gdouble : Read / Write The width of the rectangle.Default value: 0 <anchor id="CcRectangle--position-x"/>The "<literal>position-x</literal>" property -CcRectangle:position-x "position-x" gdouble : Read / Write +CcRectangle:position-x "position-x" gdouble : Read / Write The x position of the rectangle.Default value: 0 <anchor id="CcRectangle--position-y"/>The "<literal>position-y</literal>" property -CcRectangle:position-y "position-y" gdouble : Read / Write +CcRectangle:position-y "position-y" gdouble : Read / Write The y position of the rectangle.Default value: 0 diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/rounded-rectangle.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/rounded-rectangle.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/rounded-rectangle.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/rounded-rectangle.xml 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,134 @@ + + + + +rounded-rectangle +3 +CCC Library + + + +rounded-rectangle + + + + + +Synopsis + + + +#include <ccc.h> + + +typedef CcRoundedRectangle; +typedef CcRoundedRectangleClass; +CcItem* cc_rounded_rectangle_new (void); +void cc_rounded_rectangle_set_radius (CcRoundedRectangle *self, + gdouble radius); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcShape + +----CcRectangle + +----CcRoundedRectangle + + + + + + + +Implemented Interfaces + +CcRoundedRectangle implements + CcItemView. + + + + + +Properties + + + "corner-radius" gdouble : Read / Write + + + + + + +Description + + + + + + +Details + +<anchor id="CcRoundedRectangle" role="typedef"/>CcRoundedRectangle +CcRoundedRectangletypedef CcRectangle CcRoundedRectangle; + + + + + +<anchor id="CcRoundedRectangleClass" role="typedef"/>CcRoundedRectangleClass +CcRoundedRectangleClasstypedef CcRectangleClass CcRoundedRectangleClass; + + + + + +<anchor id="cc-rounded-rectangle-new" role="function"/>cc_rounded_rectangle_new () +cc_rounded_rectangle_newCcItem* cc_rounded_rectangle_new (void); + + + +Returns : + + + + + +<anchor id="cc-rounded-rectangle-set-radius" role="function"/>cc_rounded_rectangle_set_radius () +cc_rounded_rectangle_set_radiusvoid cc_rounded_rectangle_set_radius (CcRoundedRectangle *self, + gdouble radius); + + + +self : + + +radius : + + + + + + + + +Property Details +<anchor id="CcRoundedRectangle--corner-radius"/>The "<literal>corner-radius</literal>" property +CcRoundedRectangle:corner-radius "corner-radius" gdouble : Read / Write +The radius used for the rounded corners.Allowed values: >= 0 +Default value: 5 + + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/shape.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/shape.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/shape.xml 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/shape.xml 2007-05-05 23:29:45.000000000 +0100 @@ -0,0 +1,257 @@ + + + + +shape +3 +CCC Library + + + +shape + + + + + +Synopsis + + + +#include <ccc.h> + + + CcShape; + CcShapeClass; +CcBrush* cc_shape_get_brush_border (CcShape *self); +CcBrush* cc_shape_get_brush_content (CcShape *self); +GType cc_shape_get_type (void); +gdouble cc_shape_get_width (CcShape *shape, + CcView const*view); +void cc_shape_set_brush_border (CcShape *self, + CcBrush *brush); +void cc_shape_set_brush_content (CcShape *self, + CcBrush *brush); +void cc_shape_set_width_pixels (CcShape *self, + gdouble width); +void cc_shape_set_width_units (CcShape *self, + gdouble width); + + + + + +Object Hierarchy + + + GObject + +----GInitiallyUnowned + +----CcItem + +----CcShape + +----CcLine + +----CcCircle + +----CcRectangle + +----CcText + + + + + + + +Implemented Interfaces + +CcShape implements + CcItemView. + + + + + +Properties + + + "brush-border" CcBrush : Read / Write + "brush-content" CcBrush : Read / Write + "width" CcDistance : Read / Write + + + + + + +Description + + + + + + +Details + +<anchor id="CcShape-struct" role="struct"/>CcShape +CcShapetypedef struct _CcShape CcShape; + + + + +<anchor id="CcShapeClass" role="struct"/>CcShapeClass +CcShapeClasstypedef struct { + CcItemClass base_class; + + void (*path) (CcShape* self, + CcView * view, + cairo_t* cr); + void (*render_content) (CcShape* self, + CcView * view, + cairo_t* cr); + void (*render_border) (CcShape* self, + CcView * view, + cairo_t* cr); +} CcShapeClass; + + + + + +<anchor id="cc-shape-get-brush-border" role="function"/>cc_shape_get_brush_border () +cc_shape_get_brush_borderCcBrush* cc_shape_get_brush_border (CcShape *self); + + + +self : + + +Returns : + + + + + +<anchor id="cc-shape-get-brush-content" role="function"/>cc_shape_get_brush_content () +cc_shape_get_brush_contentCcBrush* cc_shape_get_brush_content (CcShape *self); + + + +self : + + +Returns : + + + + + +<anchor id="cc-shape-get-type" role="function"/>cc_shape_get_type () +cc_shape_get_typeGType cc_shape_get_type (void); + + + +Returns : + + + + + +<anchor id="cc-shape-get-width" role="function"/>cc_shape_get_width () +cc_shape_get_widthgdouble cc_shape_get_width (CcShape *shape, + CcView const*view); + + + +shape : + + +view : + + +Returns : + + + + + +<anchor id="cc-shape-set-brush-border" role="function"/>cc_shape_set_brush_border () +cc_shape_set_brush_bordervoid cc_shape_set_brush_border (CcShape *self, + CcBrush *brush); + + + +self : + + +brush : + + + + + + +<anchor id="cc-shape-set-brush-content" role="function"/>cc_shape_set_brush_content () +cc_shape_set_brush_contentvoid cc_shape_set_brush_content (CcShape *self, + CcBrush *brush); + + + +self : + + +brush : + + + + + + +<anchor id="cc-shape-set-width-pixels" role="function"/>cc_shape_set_width_pixels () +cc_shape_set_width_pixelsvoid cc_shape_set_width_pixels (CcShape *self, + gdouble width); + + + +self : + + +width : + + + + + + +<anchor id="cc-shape-set-width-units" role="function"/>cc_shape_set_width_units () +cc_shape_set_width_unitsvoid cc_shape_set_width_units (CcShape *self, + gdouble width); + + + +self : + + +width : + + + + + + + + +Property Details +<anchor id="CcShape--brush-border"/>The "<literal>brush-border</literal>" property +CcShape:brush-border "brush-border" CcBrush : Read / Write +The brush for drawing the border. +<anchor id="CcShape--brush-content"/>The "<literal>brush-content</literal>" property +CcShape:brush-content "brush-content" CcBrush : Read / Write +The brush for drawing the content. +<anchor id="CcShape--width"/>The "<literal>width</literal>" property +CcShape:width "width" CcDistance : Read / Write +The width of the outline. + + + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/text.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/text.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/text.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/text.xml 2007-05-05 23:29:45.000000000 +0100 @@ -19,16 +19,29 @@ +#include <ccc.h> - CcText; - CcTextClass; -CcItem* cc_text_new (gchar const *text); -void cc_text_set_anchor (CcText *self, - gdouble x, - gdouble y); -void cc_text_set_anchor_type (CcText *self, - GtkAnchorType anchor); + CcText; + CcTextClass; +CcItem* cc_text_new (gchar const *text); +void cc_text_set_anchor (CcText *self, + gdouble x, + gdouble y); +void cc_text_set_anchor_type (CcText *self, + GtkAnchorType anchor); +gcharconst* cc_text_get_text (CcText const *self); +gboolean cc_text_is_editable (CcText const *self); +void cc_text_set_editable (CcText *self, + gboolean editable); +void cc_text_set_font_description (CcText *self, + PangoFontDescription *desc); +void cc_text_set_markup (CcText *self, + gchar const *markup); +void cc_text_set_size_pixels (CcText *self, + gboolean size_pixels); +void cc_text_set_text (CcText *self, + gchar const *text); @@ -52,7 +65,7 @@ Implemented Interfaces CcText implements - + CcItemView. @@ -61,11 +74,13 @@ Properties - "anchor" GtkAnchorType : Read / Write / Construct - "cursor" gint : - "editable" gboolean : Read / Write - "size-pixels" gboolean : Read / Write - "text" gchararray : Read / Write + "anchor" GtkAnchorType : Read / Write / Construct + "attributes" PangoAttrList : Read / Write + "brush-caret" CcBrush : Read / Write + "cursor" gint : + "editable" gboolean : Read / Write + "size-pixels" gboolean : Read / Write + "text" gchararray : Read / Write @@ -92,7 +107,7 @@ CcShapeClass base_class; /* vtable */ - void (*delete) (CcText * self, + void (*remove) (CcText * self, guint offset, gsize length); void (*insert) (CcText * self, @@ -105,7 +120,7 @@ <anchor id="cc-text-new" role="function"/>cc_text_new () -cc_text_newCcItem* cc_text_new (gchar const *text); +cc_text_newCcItem* cc_text_new (gchar const *text); @@ -119,63 +134,180 @@ <anchor id="cc-text-set-anchor" role="function"/>cc_text_set_anchor () -cc_text_set_anchorvoid cc_text_set_anchor (CcText *self, - gdouble x, - gdouble y); +cc_text_set_anchorvoid cc_text_set_anchor (CcText *self, + gdouble x, + gdouble y); + +Specify the location of the anchor point of the text item. self : - + a CcText x : - + the horizontal position of the anchor point y : + the vertical position of the anchor point + + + +<anchor id="cc-text-set-anchor-type" role="function"/>cc_text_set_anchor_type () +cc_text_set_anchor_typevoid cc_text_set_anchor_type (CcText *self, + GtkAnchorType anchor); + +Set the anchor type of the text item. It specifies the location of the +anchor point relative to the text (so that north-west would become the +top-left corner). + + + +self : + a CcText + +anchor : + the anchor type to be specified + + + +<anchor id="cc-text-get-text" role="function"/>cc_text_get_text () +cc_text_get_textgcharconst* cc_text_get_text (CcText const *self); + + + +self : + +Returns : -<anchor id="cc-text-set-anchor-type" role="function"/>cc_text_set_anchor_type () -cc_text_set_anchor_typevoid cc_text_set_anchor_type (CcText *self, - GtkAnchorType anchor); +<anchor id="cc-text-is-editable" role="function"/>cc_text_is_editable () +cc_text_is_editablegboolean cc_text_is_editable (CcText const *self); self : -anchor : +Returns : + + + + + +<anchor id="cc-text-set-editable" role="function"/>cc_text_set_editable () +cc_text_set_editablevoid cc_text_set_editable (CcText *self, + gboolean editable); + + + +self : + + +editable : + +<anchor id="cc-text-set-font-description" role="function"/>cc_text_set_font_description () +cc_text_set_font_descriptionvoid cc_text_set_font_description (CcText *self, + PangoFontDescription *desc); + +Sets the font description to be used for rendering. + + + +self : + a CcText + +desc : + a PangoFontDescription + + + +<anchor id="cc-text-set-markup" role="function"/>cc_text_set_markup () +cc_text_set_markupvoid cc_text_set_markup (CcText *self, + gchar const *markup); + +Set the markup displayed by this item. + + + +self : + a CcText + +markup : + the markup to be set + + + +<anchor id="cc-text-set-size-pixels" role="function"/>cc_text_set_size_pixels () +cc_text_set_size_pixelsvoid cc_text_set_size_pixels (CcText *self, + gboolean size_pixels); + +Specify whether the text size is given in pixels. If it is, the text won't +scale with the zoom level. + + + +self : + a Cctext + +size_pixels : + the value to be set + + + +<anchor id="cc-text-set-text" role="function"/>cc_text_set_text () +cc_text_set_textvoid cc_text_set_text (CcText *self, + gchar const *text); + +Set the text to be displayed by a CcText item. + + + +self : + a CcText + +text : + the text to be set + + Property Details <anchor id="CcText--anchor"/>The "<literal>anchor</literal>" property -CcText:anchor "anchor" GtkAnchorType : Read / Write / Construct +CcText:anchor "anchor" GtkAnchorType : Read / Write / Construct The location of the anchor point of the text element.Default value: GTK_ANCHOR_NORTH_WEST +<anchor id="CcText--attributes"/>The "<literal>attributes</literal>" property +CcText:attributes "attributes" PangoAttrList : Read / Write +The PangoAttrList that specifies the . +<anchor id="CcText--brush-caret"/>The "<literal>brush-caret</literal>" property +CcText:brush-caret "brush-caret" CcBrush : Read / Write +The brush used to paint the caret (text cursor). <anchor id="CcText--cursor"/>The "<literal>cursor</literal>" property -CcText:cursor "cursor" gint : +CcText:cursor "cursor" gint : cursor.Allowed values: [0,0] Default value: 0 <anchor id="CcText--editable"/>The "<literal>editable</literal>" property -CcText:editable "editable" gboolean : Read / Write +CcText:editable "editable" gboolean : Read / Write editable.Default value: FALSE <anchor id="CcText--size-pixels"/>The "<literal>size-pixels</literal>" property -CcText:size-pixels "size-pixels" gboolean : Read / Write +CcText:size-pixels "size-pixels" gboolean : Read / Write Specifies whether the given size is in pixels or in canvas units.Default value: FALSE <anchor id="CcText--text"/>The "<literal>text</literal>" property -CcText:text "text" gchararray : Read / Write +CcText:text "text" gchararray : Read / Write The displayed text.Default value: NULL diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/utils.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/utils.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/utils.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/utils.xml 2007-05-05 23:29:45.000000000 +0100 @@ -19,15 +19,18 @@ +#include <ccc.h> -gboolean cc_accumulator_boolean (GSignalInvocationHint *hint, - GValue *return_accu, - GValue const *handler_return, - gpointer data); -void cc_point_grid_align (gdouble *x, - gdouble *y, - gdouble *width); +gboolean cc_accumulator_boolean (GSignalInvocationHint *hint, + GValue *return_accu, + GValue const *handler_return, + gpointer data); +void cc_point_grid_align (gdouble *x, + gdouble *y, + gdouble *width); +#define cc_return_if_unimplemented (klass, member) +#define cc_return_if_unimplemented_code (klass, member, CODE) @@ -51,10 +54,10 @@ Details <anchor id="cc-accumulator-boolean" role="function"/>cc_accumulator_boolean () -cc_accumulator_booleangboolean cc_accumulator_boolean (GSignalInvocationHint *hint, - GValue *return_accu, - GValue const *handler_return, - gpointer data); +cc_accumulator_booleangboolean cc_accumulator_boolean (GSignalInvocationHint *hint, + GValue *return_accu, + GValue const *handler_return, + gpointer data); Serves as a simple accumulator for signal emission. If you set cc_accumulator_boolean() as the accumulator for a signal, the signal will @@ -79,9 +82,9 @@ <anchor id="cc-point-grid-align" role="function"/>cc_point_grid_align () -cc_point_grid_alignvoid cc_point_grid_align (gdouble *x, - gdouble *y, - gdouble *width); +cc_point_grid_alignvoid cc_point_grid_align (gdouble *x, + gdouble *y, + gdouble *width); Rounds the coordinates x and y. Rounds width to the nearest integer, the result of this conversion is needed for the other calculation. @@ -103,6 +106,40 @@ the width of a line + +<anchor id="cc-return-if-unimplemented" role="macro"/>cc_return_if_unimplemented() +cc_return_if_unimplemented#define cc_return_if_unimplemented(klass, member) cc_return_if_unimplemented_code(klass, member, {}) + + + + +klass : + + +member : + + + + + + +<anchor id="cc-return-if-unimplemented-code" role="macro"/>cc_return_if_unimplemented_code() +cc_return_if_unimplemented_code#define cc_return_if_unimplemented_code(klass, member, CODE) + + + +klass : + + +member : + + +CODE : + + + + + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/view-cell-renderer.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/view-cell-renderer.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/view-cell-renderer.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/view-cell-renderer.xml 2007-05-05 23:29:45.000000000 +0100 @@ -19,11 +19,12 @@ +#include <ccc.h> - CcViewCellRenderer; - CcViewCellRendererClass; -GtkCellRenderer* cc_view_cell_renderer_new (void); + CcViewCellRenderer; + CcViewCellRendererClass; +GtkCellRenderer* cc_view_cell_renderer_new (void); @@ -43,6 +44,13 @@ + +Implemented Interfaces + +CcViewCellRenderer implements + CcView and CcItemView. + + @@ -74,13 +82,14 @@ <anchor id="cc-view-cell-renderer-new" role="function"/>cc_view_cell_renderer_new () -cc_view_cell_renderer_newGtkCellRenderer* cc_view_cell_renderer_new (void); +cc_view_cell_renderer_newGtkCellRenderer* cc_view_cell_renderer_new (void); + +Creates a GtkCellRenderer that can be used to display a canvas in a +GtkCellLayout (like GtkTreeView or GtkComboBox). -Returns : - - +Returns :a new instance of CcViewCellRenderer. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/view-widget.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/view-widget.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/view-widget.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/view-widget.xml 2007-05-05 23:29:45.000000000 +0100 @@ -19,15 +19,16 @@ +#include <ccc.h> - CcViewWidget; - CcViewWidgetClass; -GtkWidget* cc_view_widget_new (void); -GtkWidget* cc_view_widget_new_root (CcItem *root); -gboolean cc_view_widget_get_center_view (CcViewWidget const*self); -void cc_view_widget_set_center_view (CcViewWidget *self, - gboolean center_view); + CcViewWidget; + CcViewWidgetClass; +GtkWidget* cc_view_widget_new (void); +GtkWidget* cc_view_widget_new_root (CcItem *root); +gboolean cc_view_widget_get_center_view (CcViewWidget const*self); +void cc_view_widget_set_center_view (CcViewWidget *self, + gboolean center_view); @@ -52,7 +53,7 @@ Implemented Interfaces CcViewWidget implements - AtkImplementorIface. + CcView, CcItemView and AtkImplementorIface. @@ -61,7 +62,7 @@ Properties - "center-view" gboolean : Read / Write + "center-view" gboolean : Read / Write @@ -69,11 +70,7 @@ Signals -"set-scroll-adjustments" - void user_function (CcViewWidget *hadjustment, - GtkAdjustment *vadjustment, - GtkAdjustment *arg2, - gpointer user_data) : Run last + "set-scroll-adjustments" : Run Last @@ -109,7 +106,7 @@ <anchor id="cc-view-widget-new" role="function"/>cc_view_widget_new () -cc_view_widget_newGtkWidget* cc_view_widget_new (void); +cc_view_widget_newGtkWidget* cc_view_widget_new (void); Create a new CcViewWidget. @@ -120,7 +117,7 @@ <anchor id="cc-view-widget-new-root" role="function"/>cc_view_widget_new_root () -cc_view_widget_new_rootGtkWidget* cc_view_widget_new_root (CcItem *root); +cc_view_widget_new_rootGtkWidget* cc_view_widget_new_root (CcItem *root); Create a new CcViewWidget and set root to be the model. @@ -134,7 +131,7 @@ <anchor id="cc-view-widget-get-center-view" role="function"/>cc_view_widget_get_center_view () -cc_view_widget_get_center_viewgboolean cc_view_widget_get_center_view (CcViewWidget const*self); +cc_view_widget_get_center_viewgboolean cc_view_widget_get_center_view (CcViewWidget const*self); Find out whether the view is centered. @@ -149,8 +146,8 @@ <anchor id="cc-view-widget-set-center-view" role="function"/>cc_view_widget_set_center_view () -cc_view_widget_set_center_viewvoid cc_view_widget_set_center_view (CcViewWidget *self, - gboolean center_view); +cc_view_widget_set_center_viewvoid cc_view_widget_set_center_view (CcViewWidget *self, + gboolean center_view); Specify whether the model should be displayed centered if there is as much space. @@ -169,7 +166,7 @@ Property Details <anchor id="CcViewWidget--center-view"/>The "<literal>center-view</literal>" property -CcViewWidget:center-view "center-view" gboolean : Read / Write +CcViewWidget:center-view "center-view" gboolean : Read / Write Display the model centered if there is more space than the model needs.Default value: TRUE @@ -178,10 +175,10 @@ Signal Details <anchor id="CcViewWidget-set-scroll-adjustments"/>The "set-scroll-adjustments" signal -CcViewWidget::set-scroll-adjustmentsvoid user_function (CcViewWidget *hadjustment, - GtkAdjustment *vadjustment, - GtkAdjustment *arg2, - gpointer user_data) : Run last +CcViewWidget::set-scroll-adjustmentsvoid user_function (CcViewWidget *hadjustment, + GtkAdjustment *vadjustment, + GtkAdjustment *arg2, + gpointer user_data) : Run Last This signal gets emitted when the widget is being added to a scrollable container. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/view.xml /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/view.xml --- /tmp/vgIwXsgmrf/libccc-0.0.3/doc/reference/xml/view.xml 2006-09-03 19:57:14.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/doc/reference/xml/view.xml 2007-05-05 23:29:45.000000000 +0100 @@ -16,33 +16,87 @@ Synopsis - + +#include <ccc.h> - CcViewIface; -CcItem* cc_view_get_root (CcView *self); -void cc_view_set_root (CcView *self, - CcItem *root); -gdouble cc_view_get_zoom (CcView *self); -void cc_view_set_zoom (CcView *self, - gdouble zoom); -void cc_view_window_to_world (CcView *self, - gdouble *x, - gdouble *y); -void cc_view_world_to_window (CcView *self, - gdouble *x, - gdouble *y); +enum CcZoomMode; + CcView; + CcViewIface; +CcItem* cc_view_get_root (CcView *self); +void cc_view_set_root (CcView *self, + CcItem *root); +gdouble cc_view_get_zoom (CcView *self); +void cc_view_set_zoom (CcView *self, + gdouble zoom); +void cc_view_window_to_world (CcView const*self, + gdouble *x, + gdouble *y); +void cc_view_world_to_window (CcView const*self, + gdouble *x, + gdouble *y); +CcItem* cc_view_get_focus (const CcView *self); +CcDRect* cc_view_get_scrolled_region (CcView *self); +gint cc_view_grab_item (CcView *self, + CcItem *item, + GdkEventMask mask, + GdkCursor *cursor, + guint32 time); +void cc_view_set_focus (CcView *self, + CcItem *focus); +void cc_view_set_scrolled_region (CcView *self, + CcDRect const*scrolled_region); +void cc_view_ungrab_item (CcView *self, + CcItem *item, + guint32 time); +void cc_view_world_to_window_distance (CcView const*self, + gdouble *x, + gdouble *y); + +Object Hierarchy + + + GInterface + +----CcView + + + + + +Prerequisites + +CcView requires + CcItemView and GObject. + + +Known Implementations + +CcView is implemented by + CcCamera, CcViewCellRenderer and CcViewWidget. + + + +Properties + + + "focus" CcItem : Read / Write + "root" CcItem : Read / Write + "scrolled-region" CcDRect : Read / Write + "zoom" gdouble : Read / Write / Construct + "zoom-mode" CcZoomMode : Read / Write + + @@ -56,6 +110,24 @@ Details +<anchor id="CcZoomMode" role="enum"/>enum CcZoomMode +CcZoomModetypedef enum { + CC_ZOOM_PIXELS, + CC_ZOOM_WIDTH, + CC_ZOOM_HEIGHT, + CC_ZOOM_AUTO +} CcZoomMode; + + + + + +<anchor id="CcView-struct" role="struct"/>CcView +CcViewtypedef struct _CcView CcView; + + + + <anchor id="CcViewIface" role="struct"/>CcViewIface CcViewIfacetypedef struct { GTypeInterface base_iface; @@ -69,13 +141,13 @@ void (*ungrab_item) (CcView * self, CcItem * item, guint32 time); - void (*window_to_world) (CcView * self, + void (*window_to_world) (CcView const* self, gdouble * x, gdouble * y); - void (*world_to_window) (CcView * self, + void (*world_to_window) (CcView const* self, gdouble * x, gdouble * y); - void (*world_to_window_distance)(CcView * self, + void (*world_to_window_distance)(CcView const* self, gdouble * x, gdouble * y); } CcViewIface; @@ -85,7 +157,7 @@ <anchor id="cc-view-get-root" role="function"/>cc_view_get_root () -cc_view_get_rootCcItem* cc_view_get_root (CcView *self); +cc_view_get_rootCcItem* cc_view_get_root (CcView *self); Get the model that's displayed by self. @@ -99,8 +171,8 @@ <anchor id="cc-view-set-root" role="function"/>cc_view_set_root () -cc_view_set_rootvoid cc_view_set_root (CcView *self, - CcItem *root); +cc_view_set_rootvoid cc_view_set_root (CcView *self, + CcItem *root); Set root as the model to be displayed in self. @@ -115,7 +187,7 @@ <anchor id="cc-view-get-zoom" role="function"/>cc_view_get_zoom () -cc_view_get_zoomgdouble cc_view_get_zoom (CcView *self); +cc_view_get_zoomgdouble cc_view_get_zoom (CcView *self); Get the zoom of the view. @@ -129,8 +201,8 @@ <anchor id="cc-view-set-zoom" role="function"/>cc_view_set_zoom () -cc_view_set_zoomvoid cc_view_set_zoom (CcView *self, - gdouble zoom); +cc_view_set_zoomvoid cc_view_set_zoom (CcView *self, + gdouble zoom); Set the zoom of the canvas. @@ -145,9 +217,9 @@ <anchor id="cc-view-window-to-world" role="function"/>cc_view_window_to_world () -cc_view_window_to_worldvoid cc_view_window_to_world (CcView *self, - gdouble *x, - gdouble *y); +cc_view_window_to_worldvoid cc_view_window_to_world (CcView const*self, + gdouble *x, + gdouble *y); Convert window_x and window_y to world_x and world_y if given. @@ -165,9 +237,9 @@ <anchor id="cc-view-world-to-window" role="function"/>cc_view_world_to_window () -cc_view_world_to_windowvoid cc_view_world_to_window (CcView *self, - gdouble *x, - gdouble *y); +cc_view_world_to_windowvoid cc_view_world_to_window (CcView const*self, + gdouble *x, + gdouble *y); Convert x and y to window coordinates if given. @@ -183,6 +255,159 @@ target for a window coordinate, may be NULL + +<anchor id="cc-view-get-focus" role="function"/>cc_view_get_focus () +cc_view_get_focusCcItem* cc_view_get_focus (const CcView *self); + + + +self : + + +Returns : + + + + + +<anchor id="cc-view-get-scrolled-region" role="function"/>cc_view_get_scrolled_region () +cc_view_get_scrolled_regionCcDRect* cc_view_get_scrolled_region (CcView *self); + +Get the scrolled region of this view. + + + +self : + a CcView + +Returns :the scrolled region of this view. + + + +<anchor id="cc-view-grab-item" role="function"/>cc_view_grab_item () +cc_view_grab_itemgint cc_view_grab_item (CcView *self, + CcItem *item, + GdkEventMask mask, + GdkCursor *cursor, + guint32 time); + +Grab the item. + + + +self : + a CcView + +item : + a CcItem + +mask : + a GdkEventMask + +cursor : + a GdkCursor + +time : + the time + +Returns :GDK_GRAB_NOT_VIEWABLE if the view cannot grab at all. + + + +<anchor id="cc-view-set-focus" role="function"/>cc_view_set_focus () +cc_view_set_focusvoid cc_view_set_focus (CcView *self, + CcItem *focus); + + + +self : + + +focus : + + + + + + +<anchor id="cc-view-set-scrolled-region" role="function"/>cc_view_set_scrolled_region () +cc_view_set_scrolled_regionvoid cc_view_set_scrolled_region (CcView *self, + CcDRect const*scrolled_region); + +Set scrolled_region as the region to be displayed and/or reachable with +scrollbars. + + + +self : + a CcView + +scrolled_region : + a CcItem + + + +<anchor id="cc-view-ungrab-item" role="function"/>cc_view_ungrab_item () +cc_view_ungrab_itemvoid cc_view_ungrab_item (CcView *self, + CcItem *item, + guint32 time); + + + +self : + + +item : + + +time : + + + + + + +<anchor id="cc-view-world-to-window-distance" role="function"/>cc_view_world_to_window_distance () +cc_view_world_to_window_distancevoid cc_view_world_to_window_distance (CcView const*self, + gdouble *x, + gdouble *y); + +Convert x and y to window coordinates + + + +self : + a CcView + +x : + target for a window distance, may be NULL + +y : + target for a window distance, may be NULL + + + + + +Property Details +<anchor id="CcView--focus"/>The "<literal>focus</literal>" property +CcView:focus "focus" CcItem : Read / Write +Focus. +<anchor id="CcView--root"/>The "<literal>root</literal>" property +CcView:root "root" CcItem : Read / Write +The root element of this canvas. +<anchor id="CcView--scrolled-region"/>The "<literal>scrolled-region</literal>" property +CcView:scrolled-region "scrolled-region" CcDRect : Read / Write +scrolled-region. +<anchor id="CcView--zoom"/>The "<literal>zoom</literal>" property +CcView:zoom "zoom" gdouble : Read / Write / Construct +Zoom.Allowed values: >= G_MINDOUBLE +Default value: 1 + +<anchor id="CcView--zoom-mode"/>The "<literal>zoom-mode</literal>" property +CcView:zoom-mode "zoom-mode" CcZoomMode : Read / Write +BLURB.Default value: CC_ZOOM_PIXELS + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/editor/ce-window.c /tmp/irThAZDHWn/libccc-0.0.5/editor/ce-window.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/editor/ce-window.c 2006-06-13 12:02:10.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/editor/ce-window.c 2007-05-05 15:00:24.000000000 +0100 @@ -125,6 +125,10 @@ /* put the window into a usable state */ cw_action_canvas_new(NULL, self); + + gtk_action_set_visible(gtk_ui_manager_get_action(mainwin->ui_manager, + "/menubar/File/FileClose"), + FALSE); } static void diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/editor/herzi-main-window.c /tmp/irThAZDHWn/libccc-0.0.5/editor/herzi-main-window.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/editor/herzi-main-window.c 2006-06-13 12:02:10.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/editor/herzi-main-window.c 2006-11-04 14:19:19.000000000 +0000 @@ -51,7 +51,7 @@ } static void -hmw_abount() {} +hmw_about() {} static GtkActionEntry hmw_actions[] = { {"File", NULL, N_("_File")}, diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/editor/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/editor/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/editor/Makefile.in 2006-09-03 19:57:11.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/editor/Makefile.in 2007-05-05 23:17:42.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +34,51 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +noinst_PROGRAMS = ccc-editor$(EXEEXT) $(am__EXEEXT_1) +subdir = editor +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +am__EXEEXT_1 = +PROGRAMS = $(noinst_PROGRAMS) +am__objects_1 = +am_ccc_editor_OBJECTS = ce-canvas-tree-model.$(OBJEXT) \ + ce-main.$(OBJEXT) ce-window.$(OBJEXT) demo-canvas.$(OBJEXT) \ + gtk-helpers.$(OBJEXT) herzi-main-window.$(OBJEXT) \ + $(am__objects_1) +ccc_editor_OBJECTS = $(am_ccc_editor_OBJECTS) +am__DEPENDENCIES_1 = +ccc_editor_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + ../ccc/libccc-$(MILESTONE).la $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(ccc_editor_SOURCES) +DIST_SOURCES = $(ccc_editor_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -53,6 +96,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -62,7 +107,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -75,6 +124,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -83,6 +133,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -130,7 +182,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,6 +222,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -184,6 +240,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,6 +267,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -223,11 +282,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ NULL = -noinst_PROGRAMS = \ - ccc-editor \ - $(NULL) - - ccc_editor_SOURCES = \ ce-canvas-tree-model.c \ ce-canvas-tree-model.h \ @@ -248,57 +302,45 @@ ../ccc/libccc-$(MILESTONE).la \ $(NULL) - AM_CPPFLAGS = \ $(CCC_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/ccc \ $(NULL) -subdir = editor -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -noinst_PROGRAMS = ccc-editor$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - -am__objects_1 = -am_ccc_editor_OBJECTS = ce-canvas-tree-model.$(OBJEXT) ce-main.$(OBJEXT) \ - ce-window.$(OBJEXT) demo-canvas.$(OBJEXT) gtk-helpers.$(OBJEXT) \ - herzi-main-window.$(OBJEXT) $(am__objects_1) -ccc_editor_OBJECTS = $(am_ccc_editor_OBJECTS) -ccc_editor_DEPENDENCIES = ../ccc/libccc-$(MILESTONE).la -ccc_editor_LDFLAGS = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ce-canvas-tree-model.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ce-main.Po ./$(DEPDIR)/ce-window.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/demo-canvas.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtk-helpers.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/herzi-main-window.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(ccc_editor_SOURCES) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(ccc_editor_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu editor/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu editor/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ @@ -311,7 +353,7 @@ $(LINK) $(ccc_editor_LDFLAGS) $(ccc_editor_OBJECTS) $(ccc_editor_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -324,37 +366,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/herzi-main-window.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -366,14 +396,6 @@ -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -382,6 +404,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -393,10 +416,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -419,10 +443,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -436,7 +456,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -454,7 +474,6 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) - installdirs: install: install-am install-exec: install-exec-am @@ -475,7 +494,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -495,6 +514,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -532,13 +553,14 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/gtk-doc.make /tmp/irThAZDHWn/libccc-0.0.5/gtk-doc.make --- /tmp/vgIwXsgmrf/libccc-0.0.3/gtk-doc.make 2006-06-29 15:53:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/gtk-doc.make 2007-04-25 16:40:04.000000000 +0100 @@ -42,12 +42,19 @@ if ENABLE_GTK_DOC all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp #### scan #### -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(srcdir)/$(DOC_MODULE).types @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ @@ -56,11 +63,9 @@ test -f $$i || touch $$i ; \ done \ fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) touch scan-build.stamp -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### @@ -76,7 +81,7 @@ #### xml #### -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) cd $(srcdir) && \ @@ -98,9 +103,6 @@ @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp -else -all-local: -endif ############## @@ -145,9 +147,9 @@ mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/* $(distdir)/html + cp $(srcdir)/html/* $(distdir)/html if test -f $(srcdir)/$(DOC_MODULE).types; then \ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \ fi -.PHONY : dist-hook-local +.PHONY : dist-hook-local docs diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/INSTALL /tmp/irThAZDHWn/libccc-0.0.5/INSTALL --- /tmp/vgIwXsgmrf/libccc-0.0.3/INSTALL 2006-06-29 15:53:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/INSTALL 2007-04-19 16:00:46.000000000 +0100 @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -156,7 +159,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -167,9 +170,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -186,14 +189,18 @@ ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/install-sh /tmp/irThAZDHWn/libccc-0.0.5/install-sh --- /tmp/vgIwXsgmrf/libccc-0.0.3/install-sh 2006-06-29 15:53:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/install-sh 2007-04-19 16:00:44.000000000 +0100 @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2005-05-14.22 + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -41,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -59,236 +58,266 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 + -T) no_target_directory=true shift + continue;; - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi + --version) echo "$0 $scriptversion"; exit $?;; - pathcomp=$pathcomp/ + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac -fi && + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done # The final little trick to "correctly" pass the exit status to the exit trap. - { - (exit 0); exit + (exit 0); exit 0 } + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/intltool-extract.in /tmp/irThAZDHWn/libccc-0.0.5/intltool-extract.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/intltool-extract.in 2006-06-29 15:53:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/intltool-extract.in 2007-04-19 16:00:41.000000000 +0100 @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.35.0"; +my $VERSION = "0.35.5"; ## Loaded modules use strict; @@ -114,6 +114,11 @@ sub place_normal { $FILE = $ARGV[0]; $OUTFILE = "$FILE.h"; + + my $dirname = dirname ($OUTFILE); + if (! -d "$dirname" && $dirname ne "") { + system ("mkdir -p $dirname"); + } } sub place_local { @@ -156,7 +161,7 @@ --type=TYPE Specify the file type of FILENAME. Currently supports: "gettext/glade", "gettext/ini", "gettext/keys" "gettext/rfc822deb", "gettext/schemas", - "gettext/scheme", "gettext/xml" + "gettext/scheme", "gettext/xml", "gettext/quoted" -l, --local Writes output into current working directory (conflicts with --update) --update Writes output into the same directory the source file @@ -212,6 +217,7 @@ &type_scheme if $gettext_type eq "scheme"; &type_schemas if $gettext_type eq "schemas"; &type_rfc822deb if $gettext_type eq "rfc822deb"; + &type_quoted if $gettext_type eq "quoted"; } sub entity_decode_minimal @@ -242,7 +248,7 @@ { return '\"' if $_ eq '"'; return '\n' if $_ eq "\n"; - return '\\' if $_ eq '\\'; + return '\\\\' if $_ eq '\\'; return $_; } @@ -255,8 +261,11 @@ sub type_ini { ### For generic translatable desktop files ### - while ($input =~ /^_.*=(.*)$/mg) { - $messages{$1} = []; + while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) { + if (defined($2)) { + $comments{$3} = $2; + } + $messages{$3} = []; } } @@ -711,6 +720,17 @@ return @list; } +sub type_quoted { + while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { + my $message = $1; + my $before = $`; + $message =~ s/\\\"/\"/g; + $before =~ s/[^\n]//g; + $messages{$message} = []; + $loc{$message} = length ($before) + 2; + } +} + sub type_glade { ### For translatable Glade XML files ### diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/intltool-merge.in /tmp/irThAZDHWn/libccc-0.0.5/intltool-merge.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/intltool-merge.in 2006-06-29 15:53:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/intltool-merge.in 2007-04-19 16:00:41.000000000 +0100 @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.35.0"; +my $VERSION = "0.35.5"; ## Loaded modules use strict; @@ -60,6 +60,7 @@ my $DESKTOP_STYLE_ARG = 0; my $SCHEMAS_STYLE_ARG = 0; my $RFC822DEB_STYLE_ARG = 0; +my $QUOTED_STYLE_ARG = 0; my $QUIET_ARG = 0; my $PASS_THROUGH_ARG = 0; my $UTF8_ARG = 0; @@ -79,6 +80,7 @@ "desktop-style|d" => \$DESKTOP_STYLE_ARG, "schemas-style|s" => \$SCHEMAS_STYLE_ARG, "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, + "quoted-style" => \$QUOTED_STYLE_ARG, "pass-through|p" => \$PASS_THROUGH_ARG, "utf8|u" => \$UTF8_ARG, "multiple-output|m" => \$MULTIPLE_OUTPUT, @@ -157,6 +159,14 @@ &rfc822deb_merge_translations; &finalize; } +elsif ($QUOTED_STYLE_ARG && @ARGV > 2) +{ + &utf8_sanity_check; + &preparation; + &print_message; + "ed_merge_translations; + &finalize; +} else { &print_help; @@ -193,6 +203,7 @@ -k, --keys-style includes translations in the keys style -s, --schemas-style includes translations in the schemas style -r, --rfc822deb-style includes translations in the RFC822 style + --quoted-style includes translations in the quoted string style -x, --xml-style includes translations in the standard xml style Other options: @@ -415,7 +426,7 @@ { $nextfuzzy = 1 if /^#, fuzzy/; - if (/^msgid "((\\.|[^\\])*)"/ ) + if (/^msgid "((\\.|[^\\]+)*)"/ ) { $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; $msgid = ""; @@ -431,14 +442,14 @@ $nextfuzzy = 0; } - if (/^msgstr "((\\.|[^\\])*)"/) + if (/^msgstr "((\\.|[^\\]+)*)"/) { $msgstr = unescape_po_string($1); $inmsgstr = 1; $inmsgid = 0; } - if (/^"((\\.|[^\\])*)"/) + if (/^"((\\.|[^\\]+)*)"/) { $msgid .= unescape_po_string($1) if $inmsgid; $msgstr .= unescape_po_string($1) if $inmsgstr; @@ -1006,8 +1017,8 @@ if ($MULTIPLE_OUTPUT) { for my $lang (sort keys %po_files_by_lang) { - if ( ! -e $lang ) { - mkdir $lang or die "Cannot create subdirectory $lang: $!\n"; + if ( ! -d $lang ) { + mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; } open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; binmode (OUTPUT) if $^O eq 'MSWin32'; @@ -1354,3 +1365,39 @@ return @list; } +sub quoted_translation +{ + my ($lang, $string) = @_; + + $string =~ s/\\\"/\"/g; + + my $translation = $translations{$lang, $string}; + $translation = $string if !$translation; + + $translation =~ s/\"/\\\"/g; + return $translation +} + +sub quoted_merge_translations +{ + if (!$MULTIPLE_OUTPUT) { + print "Quoted only supports Multiple Output.\n"; + exit(1); + } + + for my $lang (sort keys %po_files_by_lang) { + if ( ! -d $lang ) { + mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; + } + open INPUT, "<${FILE}" or die; + open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + while () + { + s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; + print OUTPUT; + } + close OUTPUT; + close INPUT; + } +} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/intltool-update.in /tmp/irThAZDHWn/libccc-0.0.5/intltool-update.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/intltool-update.in 2006-06-29 15:53:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/intltool-update.in 2007-04-19 16:00:41.000000000 +0100 @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.35.0"; +my $VERSION = "0.35.5"; my $PACKAGE = "intltool"; ## Loaded modules @@ -90,10 +90,9 @@ $| = 1; ## Sometimes the source tree will be rooted somewhere else. -my $SRCDIR = "."; +my $SRCDIR = $ENV{"srcdir"} || "."; my $POTFILES_in; -$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"}; $POTFILES_in = "<$SRCDIR/POTFILES.in"; my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); @@ -124,8 +123,10 @@ &Console_Write_IntltoolHelp if $arg_count > 1; +my $PKGNAME = FindPackageName (); + # --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown"; +my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown"; if ($POT_ARG) { @@ -316,7 +317,8 @@ @buf_potfiles_ignore, @buf_allfiles, @buf_allfiles_sorted, - @buf_potfiles_sorted + @buf_potfiles_sorted, + @buf_potfiles_ignore_sorted ); ## Search and find all translatable files @@ -342,7 +344,7 @@ ## comparing with POTFILES.in foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") { - (-s $ignore) or next; + (-s "$SRCDIR/$ignore") or next; if ("$ignore" eq "POTFILES.ignore") { @@ -351,7 +353,7 @@ } print "Found $ignore: Ignoring files...\n" if $VERBOSE; - open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n"; + open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n"; while () { @@ -359,7 +361,7 @@ } close FILE; - @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); + @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore); } foreach my $file (@buf_i18n_plain) @@ -417,7 +419,7 @@ } } - if (/\.GetString ?\(QUOTEDTEXT/) + if (/\w\.GetString *\(QUOTEDTEXT/) { if (defined isNotValidMissing (unpack("x3 A*", $file))) { ## Remove the first 3 chars and add newline @@ -426,7 +428,8 @@ last; } - if (/_\(QUOTEDTEXT/) + ## N_ Q_ and _ are the three macros defined in gi8n.h + if (/[NQ]?_ *\(QUOTEDTEXT/) { if (defined isNotValidMissing (unpack("x3 A*", $file))) { ## Remove the first 3 chars and add newline @@ -489,6 +492,11 @@ $in2{$_} = 1; } + foreach (@buf_potfiles_ignore_sorted) + { + $in2{$_} = 1; + } + my @result; foreach (@buf_allfiles_sorted) @@ -504,7 +512,7 @@ foreach (@buf_potfiles_sorted) { chomp (my $dummy = $_); - if ("$dummy" ne "" and ! -f "../$dummy") + if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy")) { push @buf_potfiles_notexist, $_; } @@ -537,7 +545,7 @@ warn "\n" if ($VERBOSE or @result); warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; warn @buf_potfiles_notexist, "\n"; - warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n". + warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n". "containing this list of absent files has been written in the current directory.\n"; } } @@ -555,16 +563,21 @@ exit 1; } -sub GenerateHeaders +sub isIntltoolExtractInPath { - my $EXTRACT = "@INTLTOOL_EXTRACT@"; - chomp $EXTRACT; + my ($file) = @_; + # If either a file exists, or when run it returns 0 exit status + return 1 if ((-x $file) or (system("$file >/dev/null") == 0)); + return 0; +} - $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"}; +sub GenerateHeaders +{ + my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract"; ## Generate the .h header files, so we can allow glade and ## xml translation support - if (! -x "$EXTRACT") + if (! isIntltoolExtractInPath("$EXTRACT")) { print STDERR "\n *** The intltool-extract script wasn't found!" ."\n *** Without it, intltool-update can not generate files.\n"; @@ -671,12 +684,8 @@ } else { - if ($SRCDIR eq ".") { - print OUTFILE "../$_\n"; - } else { - print OUTFILE "$SRCDIR/../$_\n"; - } - $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); + print OUTFILE "$SRCDIR/../$_\n"; + $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); } next if (! $gettext_support_nonascii); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/aclocal-include.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/aclocal-include.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/aclocal-include.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/aclocal-include.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,16 @@ +# aclocal-include.m4 +# +# This macro adds the name macrodir to the set of directories +# that `aclocal' searches for macros. + +# serial 1 + +dnl AM_ACLOCAL_INCLUDE(macrodir) +AC_DEFUN([AM_ACLOCAL_INCLUDE], +[ + AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) + + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done +]) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-cflags.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-cflags.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-cflags.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-cflags.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,63 @@ +# herzi-cflags.m4 +# +# File that contains autoconf macros that perfom checks with modified CFLAGS +# and CPPFLAGS + +dnl HERZI_CHECK_HEADER([header.h],[action if succ],[action if fail],[include],[extra_flags]) +AC_DEFUN([HERZI_CHECK_HEADER],[ + HERZI_SAVE_CFLAGS="$CFLAGS" + HERZI_SAVE_CPPFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $5" + CPPFLAGS="$CPPFLAGS $5" + + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + + CFLAGS="$HERZI_SAVE_CFLAGS" + CPPFLAGS="$HERZI_SAVE_CPPFLAGS" +]) + +dnl HERZI_TRY_COMPILE([header.h],[action if succ],[action if fail],[include],[extra_flags]) +AC_DEFUN([HERZI_TRY_COMPILE],[ + HERZI_SAVE_CFLAGS="$CFLAGS" + HERZI_SAVE_CPPFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $6" + CPPFLAGS="$CPPFLAGS $6" + + AC_TRY_COMPILE([$1],[$2],[$3],[$4],[$5]) + + CFLAGS="$HERZI_SAVE_CFLAGS" + CPPFLAGS="$HERZI_SAVE_CPPFLAGS" +]) + +dnl HERZI_CHECK_CFLAGS("new cflags to try") +AC_DEFUN([HERZI_CHECK_CFLAGS],[ + HERZI_CFLAGS="" + + AC_CHECK_PROGS(XARGS,[xargs],no) + if test $XARGS = no; then + AC_MSG_ERROR([Couldn't find xargs, please install xargs]) + fi + + for option in `echo $1 | $XARGS echo`; do + AC_MSG_CHECKING([whether $CC understands $option]) + HERZI_TRY_COMPILE([],[],has_option=yes,has_option=no,[],[$option]) + + if test $has_option = yes; then + HERZI_CFLAGS="$HERZI_CFLAGS $option" + fi + AC_MSG_RESULT($has_option) + done + + CFLAGS="$CFLAGS $HERZI_CFLAGS" +]) + +dnl HERZI_CHECK_DEVELOP_CFLAGS +AC_DEFUN([HERZI_CHECK_DEVELOP_CFLAGS],[ + HERZI_CHECK_CFLAGS("-Wall -Wno-uninitialized \ + -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ + -Wnested-externs -Wpointer-arith \ + -Wcast-align -Wsign-compare \ + -Wno-strict-aliasing -Wnested-externs -Wpointer-arith \ + -Werror-implicit-function-declaration -Wswitch -g") +]) + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-gettext.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-gettext.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-gettext.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-gettext.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,20 @@ +# herzi-gettext.m4 +# +# File that contains autoconf macros that initialize gettext parameters +# (GETTEXT_PACKAGE and PACKAGE_LOCALE_DIR) + +dnl HERZI_GETTEXT +AC_DEFUN([HERZI_GETTEXT],[ + AC_REQUIRE([AM_GLIB_GNU_GETTEXT]) + + GETTEXT_PACKAGE=$1 + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The package name for gettext]) + AC_SUBST(GETTEXT_PACKAGE) + + PACKAGE_LOCALE_DIR="${PACKAGE_PREFIX}/${DATADIRNAME}/locale" + AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,"$PACKAGE_LOCALE_DIR", + [The package's locale path for gettext]) + AC_SUBST(PACKAGE_LOCALE_DIR) +]) + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-gprof.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-gprof.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-gprof.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-gprof.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,19 @@ +# herzi-gprof.m4 +# +# File that contains autoconf macros that add --enable-gprof and +# --disable-gprof + +dnl HERZI_PROG_GPROF +AC_DEFUN([HERZI_PROG_GPROF],[ + AC_MSG_CHECKING(if using gprof) + AC_ARG_ENABLE(gprof,[ --enable-gprof Enable gprof (default=off)], + ENABLE_GPROF="$enableval", + ENABLE_GPROF="no") + if test "x$ENABLE_GPROF" = "xyes"; then + CFLAGS="-g -pg $CFLAGS" + LDFLAGS="-pg $LDFLAGS" + fi + AC_MSG_RESULT($ENABLE_GPROF) + AC_SUBST(ENABLE_GPROF) +]) + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-prefix.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-prefix.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-prefix.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-prefix.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,17 @@ +# herzi-cflags.m4 +# +# File that contains autoconf macros that perfom checks with modified CFLAGS +# and CPPFLAGS + +dnl HERZI_PACKAGE_PREFIX +AC_DEFUN([HERZI_PACKAGE_PREFIX],[ + AC_MSG_CHECKING(prefix) + if test "x${prefix}" = "xNONE"; then + PACKAGE_PREFIX="${ac_default_prefix}" + else + PACKAGE_PREFIX="${prefix}" + fi + AC_SUBST(PACKAGE_PREFIX) + AC_MSG_RESULT($PACKAGE_PREFIX) +]) + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-ruby.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-ruby.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/herzi-ruby.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/herzi-ruby.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,60 @@ +# herzi-ruby.m4 +# +# M4 macros to support building ruby modules with autoconf + +dnl HERZI_RUBY_PRIV_CONFIG([VARNAME], [variable]) +dnl +dnl Get the value of the rbconfig variable $2 + +AC_DEFUN([HERZI_RUBY_PRIV_CONFIG],[ + AC_MSG_CHECKING([for ruby configuration parameter "$2"]) + $1=`$RUBY -rrbconfig -e 'print Config::CONFIG[["$2"]]'` + AC_SUBST($1) + AC_MSG_RESULT($$1) +]) + +dnl HERZI_PROG_RUBY([action if succ],[action if fail]) +dnl +dnl Checks for several aspects necessary to build ruby modules with an autotool +dnl toolchain. Sets RUBY to the name of the interpreter as well as RUBY_CFLAGS +dnl and RUBY_LIBS (just the same way PKG_CHECK_MODULES would do) + +AC_DEFUN([HERZI_PROG_RUBY],[ + AC_REQUIRE([HERZI_PACKAGE_PREFIX]) + AC_CHECK_PROGS(RUBY, [ruby ruby1.8 ruby1.6],[herzi-ruby-failed]) + + if test "x$RUBY" = "xherzi-ruby-failed"; then + ifelse([$2], , [AC_MSG_ERROR(dnl +[No ruby installation found, please install ruby from your distribution or from +http://www.ruby-lang.org/])], [$2]) + else + ifelse([$1], , [true], [$1]) + + HERZI_RUBY_PRIV_CONFIG(RUBY_ARCHDIR,archdir) + HERZI_RUBY_PRIV_CONFIG(RUBY_VERSION,ruby_version) + HERZI_RUBY_PRIV_CONFIG(RUBY_LIBS,LIBRUBYARG) + + RUBY_LIBDIR="${PACKAGE_PREFIX}/lib/ruby/$RUBY_VERSION" + AC_SUBST(RUBY_LIBDIR) + + RUBY_CFLAGS="-I$RUBY_ARCHDIR" + AC_SUBST(RUBY_CFLAGS) + + HERZI_CHECK_HEADER([ruby.h], + [ifelse([$1], , [true], [$1])], + [ifelse([$2], , [AC_MSG_ERROR([Please install ruby-dev])], [$2])], + [],[$RUBY_CFLAGS]) + fi +]) + +dnl HERZI_RUBY_ARCHDIR +dnl +dnl Set RUBY_TARGET_ARCHDIR to a correct value matching to the specified prefix, issue +dnl a warning if ruby won't find it. Will even work if specified after a +dnl conditional HERZI_PROG_RUBY + +AC_DEFUN([HERZI_RUBY_ARCHDIR],[ + if test "x$RUBY" != "xherzi-ruby-failed"; then + herzi_ruby_archdir=`$RUBY -rrbconfig -e 'print Config::CONFIG[[\"archdir\"]]'` + fi +]) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/macros/python.m4 /tmp/irThAZDHWn/libccc-0.0.5/macros/python.m4 --- /tmp/vgIwXsgmrf/libccc-0.0.3/macros/python.m4 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/macros/python.m4 2006-11-04 14:19:15.000000000 +0000 @@ -0,0 +1,84 @@ +## this one is commonly used with AM_PATH_PYTHONDIR ... +dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +dnl Check if a module containing a given symbol is visible to python. +AC_DEFUN([AM_CHECK_PYMOD], +[AC_REQUIRE([AM_PATH_PYTHON]) +py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +ifelse([$2],[], [prog=" +import sys +try: + import $1 +except ImportError: + sys.exit(1) +except: + sys.exit(0) +sys.exit(0)"], [prog=" +import $1 +$1.$2"]) +if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC + then + eval "py_cv_mod_$py_mod_var=yes" + else + eval "py_cv_mod_$py_mod_var=no" + fi +]) +py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +if test "x$py_val" != xno; then + AC_MSG_RESULT(yes) + ifelse([$3], [],, [$3 +])dnl +else + AC_MSG_RESULT(no) + ifelse([$4], [],, [$4 +])dnl +fi +]) + +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for headers required to compile python extensions) +dnl deduce PYTHON_INCLUDES +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include ],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) + +dnl +dnl JH_ADD_CFLAG(FLAG) +dnl checks whether the C compiler supports the given flag, and if so, adds +dnl it to $CFLAGS. If the flag is already present in the list, then the +dnl check is not performed. +AC_DEFUN([JH_ADD_CFLAG], +[ +case " $CFLAGS " in +*@<:@\ \ @:>@$1@<:@\ \ @:>@*) + ;; +*) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_MSG_CHECKING([whether [$]CC understands $1]) + AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) + AC_MSG_RESULT($jh_has_option) + if test $jh_has_option = no; then + CFLAGS="$save_CFLAGS" + fi + ;; +esac]) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/Makefile.am 2006-06-26 15:54:47.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/Makefile.am 2007-05-05 21:13:24.000000000 +0100 @@ -3,33 +3,43 @@ cdebug \ ccc \ demo \ - editor \ doc \ + test \ po \ + editor \ $(NULL) SUBDIRS=\ $(all_time_subdirs) \ $(NULL) +DIST_SUBDIRS=\ + $(all_time_subdirs) \ + $(NULL) + +if WITH_MONO +SUBDIRS+=csharp +endif +DIST_SUBDIRS+=csharp if WITH_RUBY SUBDIRS+=ruby endif +DIST_SUBDIRS+=ruby if WITH_PYTHON SUBDIRS+=python endif +DIST_SUBDIRS+=python -DIST_SUBDIRS=\ - $(all_time_subdirs) \ - python \ - ruby \ - $(NULL) +if DEVELOPER +SUBDIRS+=perf +endif +DIST_SUBDIRS+=perf pc_DATA=ccc-$(MILESTONE).pc pcdir=$(libdir)/pkgconfig %-$(MILESTONE).pc: %.pc - cp $< $@ + (test -f $@ && !cmp $< $@) || cp $< $@ INTLTOOL_TEMPLATES=\ intltool-extract.in \ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/Makefile.in 2006-09-03 19:56:46.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/Makefile.in 2007-05-05 23:17:44.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,9 +34,63 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -@WITH_RUBY_TRUE@am__append_1 = ruby -@WITH_PYTHON_TRUE@am__append_2 = python +@WITH_MONO_TRUE@am__append_1 = csharp +@WITH_RUBY_TRUE@am__append_2 = ruby +@WITH_PYTHON_TRUE@am__append_3 = python +@DEVELOPER_TRUE@am__append_4 = perf +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/cc-config.h.in \ + $(srcdir)/ccc.pc.in $(top_srcdir)/configure AUTHORS \ + COPYING.LIB ChangeLog INSTALL NEWS TODO compile config.guess \ + config.sub depcomp install-sh ltmain.sh missing mkinstalldirs +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = cc-config.h +CONFIG_CLEAN_FILES = ccc.pc +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pcdir)" +pcDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pc_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -55,6 +108,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -64,7 +119,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -77,6 +136,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -85,6 +145,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -132,7 +194,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -170,6 +234,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -186,6 +252,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -211,6 +279,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -229,33 +298,23 @@ cdebug \ ccc \ demo \ - editor \ doc \ + test \ po \ + editor \ $(NULL) -SUBDIRS = \ - $(all_time_subdirs) \ - $(NULL)\ -$(am__append_1) $(am__append_2) - -DIST_SUBDIRS = \ - $(all_time_subdirs) \ - python \ - ruby \ - $(NULL) - - +SUBDIRS = $(all_time_subdirs) $(NULL) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) +DIST_SUBDIRS = $(all_time_subdirs) $(NULL) csharp ruby python perf pc_DATA = ccc-$(MILESTONE).pc pcdir = $(libdir)/pkgconfig - INTLTOOL_TEMPLATES = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ $(NULL) - EXTRA_DIST = \ ccc.pc.in \ $(INTLTOOL_TEMPLATES) \ @@ -266,44 +325,42 @@ $(INTLTOOL_TEMPLATES:.in=) \ $(NULL) -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = cc-config.h -CONFIG_CLEAN_FILES = ccc.pc -DIST_SOURCES = -DATA = $(pc_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ - COPYING.LIB ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \ - cc-config.h.in ccc.pc.in compile config.guess config.sub \ - configure configure.in depcomp install-sh ltmain.sh missing \ - mkinstalldirs all: cc-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) cc-config.h: stamp-h1 @@ -315,14 +372,14 @@ stamp-h1: $(srcdir)/cc-config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status cc-config.h - -$(srcdir)/cc-config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/cc-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/cc-config.h.in + rm -f stamp-h1 + touch $@ distclean-hdr: -rm -f cc-config.h stamp-h1 -ccc.pc: $(top_builddir)/config.status ccc.pc.in +ccc.pc: $(top_builddir)/config.status $(srcdir)/ccc.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -334,23 +391,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -pcDATA_INSTALL = $(INSTALL_DATA) install-pcDATA: $(pc_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pcdir) + test -z "$(pcdir)" || $(mkdir_p) "$(DESTDIR)$(pcdir)" @list='$(pc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(pcDATA_INSTALL) $$d$$p $(DESTDIR)$(pcdir)/$$f"; \ - $(pcDATA_INSTALL) $$d$$p $(DESTDIR)$(pcdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(pcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcdir)/$$f'"; \ + $(pcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcdir)/$$f"; \ done uninstall-pcDATA: @$(NORMAL_UNINSTALL) @list='$(pc_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(pcdir)/$$f"; \ - rm -f $(DESTDIR)$(pcdir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pcdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pcdir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -360,7 +416,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -372,7 +434,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -380,7 +442,13 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -401,7 +469,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -412,14 +480,6 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -428,19 +488,22 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) cc-config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -450,10 +513,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) cc-config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -476,24 +540,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/po + $(mkdir_p) $(distdir)/. $(distdir)/macros $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -505,7 +556,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -522,13 +573,15 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -539,19 +592,46 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst @@ -571,19 +651,20 @@ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -607,8 +688,9 @@ all-am: Makefile $(DATA) cc-config.h installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(pcdir) - + for dir in "$(DESTDIR)$(pcdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -629,7 +711,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -641,13 +723,15 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -684,28 +768,25 @@ uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive dist dist-all dist-gzip distcheck distclean \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-pcDATA \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ - pdf-recursive ps ps-am ps-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-pcDATA uninstall-recursive + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pcDATA install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am uninstall-pcDATA %-$(MILESTONE).pc: %.pc - cp $< $@ + (test -f $@ && !cmp $< $@) || cp $< $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/missing /tmp/irThAZDHWn/libccc-0.0.5/missing --- /tmp/vgIwXsgmrf/libccc-0.0.3/missing 2006-06-29 15:53:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/missing 2007-04-19 16:00:44.000000000 +0100 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -15,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,14 +185,9 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,32 +281,30 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,8 +340,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +351,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/mkinstalldirs /tmp/irThAZDHWn/libccc-0.0.5/mkinstalldirs --- /tmp/vgIwXsgmrf/libccc-0.0.3/mkinstalldirs 2006-06-29 15:53:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/mkinstalldirs 2007-04-19 16:00:46.000000000 +0100 @@ -1,21 +1,33 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2005-06-29.22 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 -dirmode="" +dirmode= usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 + echo "$usage" + exit $? ;; -m) # -m PERM arg shift @@ -23,6 +35,10 @@ dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; --) # stop option processing shift break @@ -50,30 +66,58 @@ 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p -- . 2>/dev/null; then + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file shift + IFS=$oIFS - pathcomp= for d do - pathcomp="$pathcomp$d" + test "x$d" = x && continue + + pathcomp=$pathcomp$d case $pathcomp in -*) pathcomp=./$pathcomp ;; esac @@ -84,21 +128,21 @@ mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi - pathcomp="$pathcomp/" + pathcomp=$pathcomp/ done done @@ -107,5 +151,8 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/NEWS /tmp/irThAZDHWn/libccc-0.0.5/NEWS --- /tmp/vgIwXsgmrf/libccc-0.0.3/NEWS 2006-06-13 12:02:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/NEWS 2007-05-05 14:59:46.000000000 +0100 @@ -1,3 +1,48 @@ +libccc 0.0.5 +============ + +Changes since 0.0.4: + * new features: + * canvas items can be filled with gradients (linear and radial) now + * started work on resolution independence + * a very nice API to store view-specific data in items + * new classes: + * CcCamera: a CcItem that can display a different canvas + * CcViewCellRenderer: a GtkCellRenderer to render a canvas into a treeview + * new demos: + * simple animation + * item stacking (Canek Palaez) + * easy item customization (Mirco Müller) + * general header cleanup in the demo folder + * CcColor: use GTypePrivate + * CcItem: added raise() and lower() functions + * CcPixbuf: improved rotation and scaling + * CcSimpleItem: added an item that can be used for rapid prototyping + * API Reference: updated and extended + * Test Suite: added a test suite and lots of checks (though many are still + unimplemented) + * some bug fixes by Yves Combe + +libccc 0.0.4 +============ + +Changes since 0.0.3: + * started working on an editor (unusable yet) + * drop the frame rate to 25 fps + * added skeleton for c# bindings + * improved the pixbuf item (added rotation support) + * use GTypePrivate in CcLine + +libccc 0.0.3 +============ + +Changes since 0.0.2: + * improve applications performance by limiting redraws to ~33 FPS + * added python bindings from Yves Combe + * improve the redraw behavior of the circle item + * fix drawing of multiple paths in sequence + * CcText derives from CcShape to inherit fill and border properties + libccc 0.0.2 ============ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/perf/g-type-private-demo.c /tmp/irThAZDHWn/libccc-0.0.5/perf/g-type-private-demo.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/perf/g-type-private-demo.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/perf/g-type-private-demo.c 2007-05-05 15:00:47.000000000 +0100 @@ -0,0 +1,85 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "g-type-private-demo.h" + +struct _GPrivateDemoPrivate { + gchar sliff; +}; + +G_DEFINE_TYPE (GPrivateDemo, g_private_demo, G_TYPE_OBJECT); + +static void +g_private_demo_init (GPrivateDemo* self) +{ + self->_private = G_TYPE_INSTANCE_GET_PRIVATE (self, G_TYPE_PRIVATE_DEMO, GPrivateDemoPrivate); +} + +static void +g_private_demo_class_init (GPrivateDemoClass* self_class) +{ + g_type_class_add_private (self_class, sizeof (GPrivateDemoPrivate)); +} + +int +main (int argc, + char**argv) +{ + GPrivateDemoPrivate* priv; + GPrivateDemo* demo; + GTimer* timer; + gint64 n_tests = G_GINT64_CONSTANT(100000000); + gint64 i; + + /* init */ + g_type_init (); + + /* prepare */ + demo = g_object_new (G_TYPE_PRIVATE_DEMO, NULL); + timer = g_timer_new (); + + /* check 1 */ + g_timer_start (timer); + for (i = 0; i < n_tests; i++) { + priv = demo->_private; + } + g_timer_stop (timer); + g_print ("%" G_GINT64_FORMAT " Pointer dereferences: %f\n", n_tests, g_timer_elapsed (timer, NULL)); + + /* check 2 */ + g_timer_start (timer); + for (i = 0; i < n_tests; i++) { + priv = G_TYPE_INSTANCE_GET_PRIVATE (demo, G_TYPE_PRIVATE_DEMO, GPrivateDemoPrivate); + } + g_timer_stop (timer); + g_print ("%" G_GINT64_FORMAT " Function calls: %f\n", n_tests, g_timer_elapsed (timer, NULL)); + + /* cleanup */ + g_timer_destroy (timer); + g_object_unref (demo); + + return 0; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/perf/g-type-private-demo.h /tmp/irThAZDHWn/libccc-0.0.5/perf/g-type-private-demo.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/perf/g-type-private-demo.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/perf/g-type-private-demo.h 2007-05-05 15:00:47.000000000 +0100 @@ -0,0 +1,57 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef G_TYPE_PRIVATE_DEMO_H +#define G_TYPE_PRIVATE_DEMO_H + +#include + +G_BEGIN_DECLS + +typedef struct _GPrivateDemo GPrivateDemo; +typedef struct _GPrivateDemoPrivate GPrivateDemoPrivate; +typedef struct _GPrivateDemoClass GPrivateDemoClass; + +#define G_TYPE_PRIVATE_DEMO (g_private_demo_get_type ()) +#define G_PRIVATE_DEMO(i) (G_TYPE_CHECK_INSTANCE_CAST ((i), G_TYPE_PRIVATE_DEMO, GPrivateDemo)) +#define G_PRIVATE_DEMO_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), G_TYPE_PRIVATE_DEMO, GPrivateDemo)) +#define G_IS_PRIVATE_DEMO(i) (G_TYPE_CHECK_INSTANCE_TYPE ((i), G_TYPE_PRIVATE_DEMO)) +#define G_IS_PRIVATE_DEMO_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), G_TYPE_PRIVATE_DEMO)) +#define G_PRIVATE_DEMO_GET_CLASS(i) (G_TYPE_INSTANCE_GET_PRIVATE ((c), G_TYPE_PRIVATE_DEMO, GTypePrivateDemoClass)) + +GType g_private_demo_get_type (void); + +struct _GPrivateDemo { + GObject base_instance; + GPrivateDemoPrivate* _private; +}; + +struct _GPrivateDemoClass { + GObjectClass base_class; +}; + +G_END_DECLS + +#endif /* !G_TYPE_PRIVATE_DEMO_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/perf/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/perf/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/perf/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/perf/Makefile.am 2007-05-05 15:00:47.000000000 +0100 @@ -0,0 +1,11 @@ +noinst_PROGRAMS=\ + g-type-private-demo \ + $(NULL) + +AM_CPPFLAGS=$(CCC_CFLAGS) +LDADD=$(CCC_LIBS) + +g_type_private_demo_SOURCES=\ + g-type-private-demo.c \ + g-type-private-demo.h \ + $(NULL) diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/perf/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/perf/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/perf/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/perf/Makefile.in 2007-05-05 23:17:42.000000000 +0100 @@ -0,0 +1,537 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +noinst_PROGRAMS = g-type-private-demo$(EXEEXT) +subdir = perf +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +PROGRAMS = $(noinst_PROGRAMS) +am_g_type_private_demo_OBJECTS = g-type-private-demo.$(OBJEXT) +g_type_private_demo_OBJECTS = $(am_g_type_private_demo_OBJECTS) +g_type_private_demo_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +g_type_private_demo_DEPENDENCIES = $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(g_type_private_demo_SOURCES) +DIST_SOURCES = $(g_type_private_demo_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCC_CFLAGS = @CCC_CFLAGS@ +CCC_LIBS = @CCC_LIBS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ +DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_GPROF = @ENABLE_GPROF@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ +HTML_DIR = @HTML_DIR@ +INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ +INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_ICONV = @INTLTOOL_ICONV@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MILESTONE = @MILESTONE@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_LOCALE_DIR = @PACKAGE_LOCALE_DIR@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_PREFIX = @PACKAGE_PREFIX@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_CODEGEN = @PYGTK_CODEGEN@ +PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RUBY = @RUBY@ +RUBY_ARCHDIR = @RUBY_ARCHDIR@ +RUBY_CFLAGS = @RUBY_CFLAGS@ +RUBY_LIBDIR = @RUBY_LIBDIR@ +RUBY_LIBS = @RUBY_LIBS@ +RUBY_VERSION = @RUBY_VERSION@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ +WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ +WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ +WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ +WITH_RUBY_TRUE = @WITH_RUBY_TRUE@ +XARGS = @XARGS@ +XGETTEXT = @XGETTEXT@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +AM_CPPFLAGS = $(CCC_CFLAGS) +LDADD = $(CCC_LIBS) +g_type_private_demo_SOURCES = \ + g-type-private-demo.c \ + g-type-private-demo.h \ + $(NULL) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu perf/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu perf/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +g-type-private-demo$(EXEEXT): $(g_type_private_demo_OBJECTS) $(g_type_private_demo_DEPENDENCIES) + @rm -f g-type-private-demo$(EXEEXT) + $(LINK) $(g_type_private_demo_LDFLAGS) $(g_type_private_demo_OBJECTS) $(g_type_private_demo_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g-type-private-demo.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/po/de.po /tmp/irThAZDHWn/libccc-0.0.5/po/de.po --- /tmp/vgIwXsgmrf/libccc-0.0.3/po/de.po 2006-06-13 12:02:23.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/po/de.po 2007-04-20 09:54:30.000000000 +0100 @@ -9,25 +9,25 @@ msgstr "" "Project-Id-Version: libccc 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-22 13:50+0100\n" -"PO-Revision-Date: 2006-01-19 13:13+0100\n" +"POT-Creation-Date: 2007-01-02 11:06+0100\n" +"PO-Revision-Date: 2007-01-02 11:08+0100\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bit" #: ../ccc/cc-enumerations.c:18 -msgid "disposed" -msgstr "" +msgid "can-focus" +msgstr "Kann Fokus erhalten" #: ../ccc/cc-enumerations.c:19 -msgid "grid-aligned" -msgstr "" +msgid "disposed" +msgstr "bereinigt" #: ../ccc/cc-enumerations.c:20 -msgid "no-search-children" -msgstr "" +msgid "grid-aligned" +msgstr "eingerastet" #: ../ccc/cc-enumerations.c:36 msgid "pixels" @@ -49,6 +49,7 @@ #. * printer, you might want to have a lowercase only word here, even if #. * the correct translation would have been a capitalized word in your #. * language. -#: ../ccc/cc-printer.c:61 +#: ../ccc/cc-printer.c:63 msgid "output" -msgstr "ausgabe" +msgstr "Ausgabe" + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/po/Makefile.in.in /tmp/irThAZDHWn/libccc-0.0.5/po/Makefile.in.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/po/Makefile.in.in 2006-06-29 15:53:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/po/Makefile.in.in 2007-04-19 16:00:41.000000000 +0100 @@ -25,7 +25,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = .. +top_builddir = @top_builddir@ VPATH = @srcdir@ prefix = @prefix@ @@ -56,15 +56,19 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) + +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) + +POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS POTFILES = \ -#This Gets Replace for some reason +# This comment gets stripped out -CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) +CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat @@ -98,11 +102,7 @@ install-data-no: all install-data-yes: all $(mkdir_p) $(DESTDIR)$(itlocaledir) - if test -n "$(PO_LINGUAS)"; then \ - linguas="$(PO_LINGUAS)"; \ - else \ - linguas="$(ALL_LINGUAS)"; \ - fi; \ + linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ @@ -136,17 +136,18 @@ installcheck: uninstall: - if test -n "$(PO_LINGUAS)"; then \ - linguas="$(PO_LINGUAS)"; \ - else \ - linguas="$(ALL_LINGUAS)"; \ - fi; \ + linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot + rm -f missing notexist + srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m + if [ -r missing -o -r notexist ]; then \ + exit 1; \ + fi mostlyclean: rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp @@ -179,11 +180,7 @@ update-po: Makefile $(MAKE) $(GETTEXT_PACKAGE).pot tmpdir=`pwd`; \ - if test -n "$(PO_LINGUAS)"; then \ - linguas="$(PO_LINGUAS)"; \ - else \ - linguas="$(ALL_LINGUAS)"; \ - fi; \ + linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ echo "$$lang:"; \ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ @@ -211,8 +208,8 @@ $(MAKE) stamp-it; \ fi -stamp-it: Makefile.in.in ../config.status POTFILES.in - cd .. \ +stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ $(SHELL) ./config.status diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/po/POTFILES.in /tmp/irThAZDHWn/libccc-0.0.5/po/POTFILES.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/po/POTFILES.in 2006-06-13 12:02:23.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/po/POTFILES.in 2007-05-05 23:11:44.000000000 +0100 @@ -1,2 +1,20 @@ ccc/cc-enumerations.c +ccc/cc-linear-gradient.c ccc/cc-printer.c +ccc/cc-radial-gradient.c +ccc/cc-text.c +demo/animation.c +demo/camera.c +demo/crossing.c +demo/demo-polygon.c +demo/demo-window.c +demo/fifteen.c +demo/gradient.c +demo/layers.c +demo/line.c +demo/pixbuf-demo.c +demo/printer-demo.c +demo/simple-item.c +demo/text-demo.c +editor/ce-window.c +editor/herzi-main-window.c diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/python/cccanvas.defs /tmp/irThAZDHWn/libccc-0.0.5/python/cccanvas.defs --- /tmp/vgIwXsgmrf/libccc-0.0.3/python/cccanvas.defs 2006-06-26 15:42:20.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/python/cccanvas.defs 2007-05-05 16:10:02.000000000 +0100 @@ -7,6 +7,27 @@ (gtype-id "CC_TYPE_BRUSH") ) +(define-object Gradient + (in-module "Cc") + (parent "CcBrush") + (c-name "CcGradient") + (gtype-id "CC_TYPE_GRADIENT") +) + +(define-object RadialGradient + (in-module "Cc") + (parent "CcGradient") + (c-name "CcRadialGradient") + (gtype-id "CC_TYPE_RADIAL_GRADIENT") +) + +(define-object LinearGradient + (in-module "Cc") + (parent "CcGradient") + (c-name "CcLinearGradient") + (gtype-id "CC_TYPE_LINEAR_GRADIENT") +) + (define-object BrushColor (in-module "Cc") (parent "CcBrush") @@ -21,19 +42,40 @@ (gtype-id "CC_TYPE_COLOR") ) +(define-object ColorRgb + (in-module "Cc") + (parent "CcColor") + (c-name "CcColorRgb") + (gtype-id "CC_TYPE_COLOR_RGB") +) + +(define-object ColorHsv + (in-module "Cc") + (parent "CcColor") + (c-name "CcColorHsv") + (gtype-id "CC_TYPE_COLOR_HSV") +) + (define-object Item (in-module "Cc") (parent "GObject") (c-name "CcItem") (gtype-id "CC_TYPE_ITEM") + (implements "CcItemView") ) -(define-object ItemView +(define-interface ItemView (in-module "Cc") (c-name "CcItemView") (gtype-id "CC_TYPE_ITEM_VIEW") ) +(define-interface View + (in-module "Cc") + (c-name "CcView") + (gtype-id "CC_TYPE_VIEW") +) + (define-object Pixbuf (in-module "Cc") (parent "CcItem") @@ -41,11 +83,14 @@ (gtype-id "CC_TYPE_PIXBUF") ) + (define-object Printer (in-module "Cc") (parent "GObject") (c-name "CcPrinter") (gtype-id "CC_TYPE_PRINTER") + (implements "CcItemView") + (implements "CcView") ) (define-object Shape @@ -85,28 +130,17 @@ (define-object Text (in-module "Cc") - (parent "CcItem") + (parent "CcShape") (c-name "CcText") (gtype-id "CC_TYPE_TEXT") ) -;(define-interface View -; (in-module "Cc") -; (c-name "CcView") -; (gtype-id "CC_TYPE_VIEW") -;) - -(define-object View - (in-module "Cc") - (c-name "CcView") - (gtype-id "CC_TYPE_VIEW") -) - (define-object ViewCellRenderer (in-module "Cc") (parent "GtkCellRenderer") (c-name "CcViewCellRenderer") (gtype-id "CC_TYPE_VIEW_CELL_RENDERER") + (implements "CcItemView") (implements "CcView") ) @@ -115,6 +149,7 @@ (parent "GObject") (c-name "CcViewPNG") (gtype-id "CC_TYPE_VIEW_PNG") + (implements "CcItemView") (implements "CcView") ) @@ -123,6 +158,23 @@ (parent "GtkDrawingArea") (c-name "CcViewWidget") (gtype-id "CC_TYPE_VIEW_WIDGET") + (implements "CcItemView") + (implements "CcView") +) + +(define-object Caret + (in-module "Cc") + (parent "CcLine") + (c-name "CcCaret") + (gtype-id "CC_TYPE_CARET") +) + +(define-object Camera + (in-module "Cc") + (parent "CcItem") + (c-name "CcCamera") + (gtype-id "CC_TYPE_CAMERA") + (implements "CcItemView") (implements "CcView") ) @@ -136,7 +188,17 @@ '("can-focus" "CC_CAN_FOCUS") '("disposed" "CC_DISPOSED") '("grid-aligned" "CC_GRID_ALIGNED") - '("no-search-children" "CC_NO_SEARCH_CHILDREN") + ) +) + +(define-enum Unit + (in-module "Cc") + (c-name "CcUnit") + (gtype-id "CC_TYPE_UNIT") + (values + '("display-pixel" "CC_UNIT_DISPLAY_PIXEL") + '("point" "CC_UNIT_POINT") + '("pt" "CC_UNIT_PT") ) ) @@ -155,20 +217,13 @@ ;; From ../ccc/cc-brush-color.h -(define-function cc_brush_color_get_type - (in-module "Cc") - (c-name "cc_brush_color_get_type") - (return-type "GType") -) - -(define-function cc_brush_color_new +(define-function brush_color_new (in-module "Cc") (c-name "cc_brush_color_new") (is-constructor-of "CcBrushColor") - (caller-owns-return #f) (return-type "CcBrush*") - (parameters - '("CcColor*" "color") + (properties + '("color" (argname "color") (optional)) ) ) @@ -188,24 +243,59 @@ ) +;; From ../ccc/cc-camera.h -;; From ../ccc/cc-brush.h +(define-function camera_new + (in-module "Cc") + (c-name "cc_camera_new") + (is-constructor-of "CcCamera") + (return-type "CcItem*") +) -(define-function cc_brush_get_type - (c-name "cc_brush_get_type") - (return-type "GType") +(define-function camera_new_root + (in-module "Cc") + (c-name "cc_camera_new_root") + (return-type "CcItem*") + (parameters + '("CcItem*" "root") + ) + (caller-owns-return #t) ) -(define-method apply - (of-object "CcBrush") - (c-name "cc_brush_apply") +(define-method set_root + (of-object "CcCamera") + (c-name "cc_camera_set_root") (return-type "none") (parameters - '("cairo_t*" "cr") + '("CcItem*" "root") ) ) +(define-method get_root + (of-object "CcCamera") + (c-name "cc_camera_get_root") + (return-type "CcItem*") +) + +;; From ../ccc/cc-caret.h + +(define-function caret_new + (c-name "cc_caret_new") + (is-constructor-of "CcCaret") + (return-type "CcItem*") +) +(define-method set_position + (of-object "CcCaret") + (c-name "cc_caret_set_position") + (return-type "none") + (parameters + '("gdouble" "x1") + '("gdouble" "y1") + '("gdouble" "x2") + '("gdouble" "y2") + ) +) ;; From ../ccc/ccc.h @@ -213,15 +303,10 @@ ;; From ../ccc/cc-circle.h -(define-function cc_circle_get_type - (c-name "cc_circle_get_type") - (return-type "GType") -) - -(define-function cc_circle_new +(define-function circle_new + (in-module "Cc") (c-name "cc_circle_new") (is-constructor-of "CcCircle") - (caller-owns-return #f) (return-type "CcItem*") ) @@ -248,67 +333,72 @@ ;; From ../ccc/cc-color.h -(define-function cc_color_get_type - (c-name "cc_color_get_type") - (return-type "GType") -) - -(define-method apply - (of-object "CcColor") - (c-name "cc_color_apply") - (return-type "none") - (parameters - '("cairo_t*" "cr") +(define-function color_new_rgba + (in-module "Cc") + (c-name "cc_color_new_rgba") + (is-constructor-of "CcColorRgb") + (return-type "CcColor*") + (properties + '("red" (argname "red")) + '("green" (argname "green")) + '("blue" (argname "blue")) + '("alpha" (argname "alpha")) ) ) -(define-function color_new_rgb +(define-function color_new_hsva (in-module "Cc") - (c-name "cc_color_new_rgb") + (c-name "cc_color_new_hsva") + (is-constructor-of "CcColorHsv") (return-type "CcColor*") - (parameters - '("gdouble" "red") - '("gdouble" "green") - '("gdouble" "blue") + (properties + '("hue" (argname "hue")) + '("saturation" (argname "saturation")) + '("value" (argname "value")) + '("alpha" (argname "alpha")) ) ) -(define-function color_new_rgba +;; From ../ccc/cc-unit.h + +(define-enum Unit (in-module "Cc") - (c-name "cc_color_new_rgba") - (return-type "CcColor*") - (parameters - '("gdouble" "red") - '("gdouble" "green") - '("gdouble" "blue") - '("gdouble" "alpha") + (c-name "CcUnit") + (gtype-id "CC_TYPE_UNIT") + (values + '("display-pixel" "CC_UNIT_DISPLAY_PIXEL") + '("point" "CC_UNIT_POINT") + '("pt" "CC_UNIT_PT") ) ) -(define-function color_new_hsv + +(define-boxed Distance (in-module "Cc") - (c-name "cc_color_new_hsv") - (return-type "CcColor*") - (parameters - '("gdouble" "hue") - '("gdouble" "saturation") + (c-name "CcDistance") + (gtype-id "CC_TYPE_DISTANCE") + (release-func cc_distance_free) + (fields '("gdouble" "value") + '("CcUnit" "unit") ) -) + ) -(define-function color_new_hsva - (in-module "Cc") - (c-name "cc_color_new_hsva") - (return-type "CcColor*") +(define-function cc_distance_new + (c-name "cc_distance_new") + (is-constructor-of "CcDistance") + (return-type "CcDistance*") (parameters - '("gdouble" "hue") - '("gdouble" "saturation") '("gdouble" "value") - '("gdouble" "alpha") + '("CcUnit" "unit") ) ) - +(define-method copy + (of-object "CcDistance") + (c-name "cc_distance_copy") + (return-type "CcDistance*") +) ;; From ../ccc/cc-d-rect.h @@ -325,7 +415,7 @@ ) ) -(define-function cc_d_rect_new +(define-function d_rect_new (c-name "cc_d_rect_new") (is-constructor-of "CcDRect") (caller-owns-return #f) @@ -338,11 +428,6 @@ ) ) -(define-function cc_d_rect_get_type - (c-name "cc_d_rect_get_type") - (return-type "GType") -) - (define-method copy (of-object "CcDRect") (c-name "cc_d_rect_copy") @@ -381,19 +466,20 @@ ;; From ../ccc/cc-enumerations.h -(define-function cc_item_flags_get_type - (c-name "cc_item_flags_get_type") - (return-type "GType") -) +;; From ../ccc/cc-gradient.h -(define-function cc_zoom_mode_get_type - (c-name "cc_zoom_mode_get_type") - (return-type "GType") +(define-method add_stop + (of-object "CcGradient") + (c-name "cc_gradient_add_stop") + (return-type "none") + (parameters + '("gdouble" "offset") + '("CcColor*" "color") + ) ) - - ;; From ../ccc/cc-item.h + (define-method SET_FLAGS (of-object "CcItem") (c-name "CC_ITEM_SET_FLAGS") @@ -403,10 +489,9 @@ ) ) -(define-function cc_item_new +(define-function item_new (c-name "cc_item_new") (is-constructor-of "CcItem") - (caller-owns-return #f) (return-type "CcItem*") ) @@ -443,9 +528,10 @@ (c-name "cc_item_distance") (return-type "gdouble") (parameters + '("CcView*" "view") '("gdouble" "x") '("gdouble" "y") -; '("CcItem*" "found") + '("CcItem**" "found") ) ) @@ -454,8 +540,8 @@ (c-name "cc_item_foreach_view") (return-type "none") (parameters - '("CcItem*" "func") - '("int" "data") + '("CcItemFunc" "func") + '("gpointer" "data") ) ) @@ -515,6 +601,24 @@ ) ) +(define-method update_bounds + (of-object "CcItem") + (c-name "cc_item_update_bounds") + (return-type "none") + (parameters + '("gpointer" "data") + ) +) + +(define-method update_bounds_for_view + (of-object "CcItem") + (c-name "cc_item_update_bounds_for_view") + (return-type "none") + (parameters + '("CcView*" "view") + ) +) + (define-method add_view (of-object "CcItem") (c-name "cc_item_add_view") @@ -533,15 +637,56 @@ ) ) +(define-method set_position + (of-object "CcItem") + (c-name "cc_item_set_position") + (return-type "none") + (parameters + '("CcItem*" "parent") + '("gint" "position") + ) +) + +(define-method raise_to_top + (of-object "CcItem") + (c-name "cc_item_raise_to_top") + (return-type "none") + (parameters + '("CcItem*" "parent") + ) +) +(define-method raise + (of-object "CcItem") + (c-name "cc_item_raise") + (return-type "none") + (parameters + '("CcItem*" "parent") + ) +) -;; From ../ccc/cc-item-view.h +(define-method lower + (of-object "CcItem") + (c-name "cc_item_lower") + (return-type "none") + (parameters + '("CcItem*" "parent") + ) +) -(define-function cc_item_view_get_type - (c-name "cc_item_view_get_type") - (return-type "GType") +(define-method lower_to_bottom + (of-object "CcItem") + (c-name "cc_item_lower_to_bottom") + (return-type "none") + (parameters + '("CcItem*" "parent") + ) ) + + +;; From ../ccc/cc-item-view.h + (define-method register (of-object "CcItemView") (c-name "cc_item_view_register") @@ -562,20 +707,35 @@ -;; From ../ccc/cc-line.h +;; From ../ccc/cc-linear-gradient.h -(define-function cc_line_get_type - (c-name "cc_line_get_type") - (return-type "GType") +(define-function linear_gradient_new + (in-module "Cc") + (c-name "cc_linear_gradient_new") + (is-constructor-of "CcLinearGradient") + (return-type "CcBrush*") + (properties + '("x1" (argname "x1")) + '("y1" (argname "y1")) + '("x2" (argname "x2")) + '("y2" (argname "y2")) + ) ) -(define-function cc_line_new +;; From ../ccc/cc-line.h + +(define-function line_new (c-name "cc_line_new") (is-constructor-of "CcLine") - (caller-owns-return #f) (return-type "CcItem*") ) +(define-method clear + (of-object "CcLine") + (c-name "cc_line_clear") + (return-type "none") +) + (define-method line (of-object "CcLine") (c-name "cc_line_line") @@ -604,15 +764,10 @@ ;; From ../ccc/cc-pixbuf.h -(define-function cc_pixbuf_get_type - (c-name "cc_pixbuf_get_type") - (return-type "GType") -) - -(define-function cc_pixbuf_new +(define-function pixbuf_new + (in-module "Cc") (c-name "cc_pixbuf_new") (is-constructor-of "CcPixbuf") - (caller-owns-return #f) (return-type "CcItem*") ) @@ -637,22 +792,49 @@ ) ) +(define-method set_position_x + (of-object "CcPixbuf") + (c-name "cc_pixbuf_set_position_x") + (return-type "none") + (parameters + '("gdouble" "pos_x") + ) +) +(define-method set_position_y + (of-object "CcPixbuf") + (c-name "cc_pixbuf_set_position_y") + (return-type "none") + (parameters + '("gdouble" "pos_y") + ) +) -;; From ../ccc/cc-printer.h +(define-method get_rotation + (of-object "CcPixbuf") + (c-name "cc_pixbuf_get_rotation") + (return-type "gdouble") +) -(define-function cc_printer_get_type - (c-name "cc_printer_get_type") - (return-type "GType") +(define-method set_rotation + (of-object "CcPixbuf") + (c-name "cc_pixbuf_set_rotation") + (return-type "none") + (parameters + '("gdouble" "rotation") + ) ) -(define-function cc_printer_new + + +;; From ../ccc/cc-printer.h + +(define-function printer_new (c-name "cc_printer_new") (is-constructor-of "CcPrinter") - (caller-owns-return #f) (return-type "CcPrinter*") - (parameters - '("const-gchar*" "filename") + (properties + '("filename" (argname "filename")) ) ) @@ -662,19 +844,25 @@ (return-type "none") ) +;; From ../ccc/cc-radial-gradient.h +(define-function radial_gradient_new + (in-module "Cc") + (c-name "cc_radial_gradient_new") + (is-constructor-of "CcRadialGradient") + (return-type "CcBrush*") + (properties + '("x" (argname "x")) + '("x" (argname "y")) + '("x" (argname "radius")) + ) +) ;; From ../ccc/cc-rectangle.h -(define-function cc_rectangle_get_type - (c-name "cc_rectangle_get_type") - (return-type "GType") -) - -(define-function cc_rectangle_new +(define-function rectangle_new (c-name "cc_rectangle_new") (is-constructor-of "CcRectangle") - (caller-owns-return #f) (return-type "CcItem*") ) @@ -730,20 +918,24 @@ ;; From ../ccc/cc-rounded-rectangle.h -(define-function cc_rounded_rectangle_get_type - (c-name "cc_rounded_rectangle_get_type") - (return-type "GType") +(define-function rounded_rectangle_new + (in-module "Cc") + (c-name "cc_rounded_rectangle_new") + (is-constructor-of "CcRoundedRectangle") + (return-type "CcItem*") ) - +(define-method set_radius + (of-object "CcRoundedRectangle") + (c-name "cc_rounded_rectangle_set_radius") + (return-type "none") + (parameters + '("gdouble" "radius") + ) +) ;; From ../ccc/cc-shape.h -(define-function cc_shape_get_type - (c-name "cc_shape_get_type") - (return-type "GType") -) - (define-method get_brush_border (of-object "CcShape") (c-name "cc_shape_get_brush_border") @@ -783,6 +975,15 @@ ) ) +(define-method set_line_width + (of-object "CcShape") + (c-name "cc_shape_set_line_width") + (return-type "none") + (parameters + '("CcDistance*" "width") + ) +) + (define-method set_width_pixels (of-object "CcShape") (c-name "cc_shape_set_width_pixels") @@ -801,22 +1002,15 @@ ) ) - - ;; From ../ccc/cc-text.h -(define-function cc_text_get_type - (c-name "cc_text_get_type") - (return-type "GType") -) - -(define-function cc_text_new +(define-function text_new + (in-module "Cc") (c-name "cc_text_new") (is-constructor-of "CcText") - (caller-owns-return #f) (return-type "CcItem*") - (parameters - '("const-gchar*" "text" (null-ok)) + (properties + '("text" (argname "text")) ) ) @@ -845,6 +1039,15 @@ ) ) +(define-method set_attributes + (of-object "CcText") + (c-name "cc_text_set_attributes") + (return-type "none") + (parameters + '("PangoAttrList*" "attrs") + ) +) + (define-method set_editable (of-object "CcText") (c-name "cc_text_set_editable") @@ -868,7 +1071,7 @@ (c-name "cc_text_set_markup") (return-type "none") (parameters - '("const-gchar*" "text") + '("gchar*" "markup") ) ) @@ -896,21 +1099,35 @@ (return-type "const-gchar*") ) - - ;; From ../ccc/cc-utils.h -;; From ../ccc/cc-view-cell-renderer.h +(define-function accumulator_boolean + (in-module "Cc") + (c-name "cc_accumulator_boolean") + (return-type "gboolean") + (parameters + '("GSignalInvocationHint*" "hint") + '("GValue*" "return_accu") + '("GValue*" "handler_return") + '("gpointer" "data") + ) +) -(define-function cc_view_cell_renderer_get_type - (c-name "cc_view_cell_renderer_get_type") - (return-type "GType") +(define-function point_grid_align + (c-name "cc_point_grid_align") + (return-type "none") + (parameters + '("gdouble*" "x") + '("gdouble*" "y") + '("gdouble*" "width") + ) ) -(define-function cc_view_cell_renderer_new +;; From ../ccc/cc-view-cell-renderer.h + +(define-function view_cell_renderer_new (c-name "cc_view_cell_renderer_new") (is-constructor-of "CcViewCellRenderer") - (caller-owns-return #f) (return-type "GtkCellRenderer*") ) @@ -1000,33 +1217,33 @@ ) ) -(define-method window_to_world - (of-object "CcView") +(define-function view_window_to_world (c-name "cc_view_window_to_world") (return-type "none") (parameters - '("gdouble" "x") - '("gdouble" "y") + '("CcView*" "self") + '("gdouble*" "x") + '("gdouble*" "y") ) ) -(define-method world_to_window - (of-object "CcView") +(define-function view_world_to_window (c-name "cc_view_world_to_window") (return-type "none") (parameters - '("gdouble" "x") - '("gdouble" "y") + '("CcView*" "self") + '("gdouble*" "x") + '("gdouble*" "y") ) ) -(define-method world_to_window_distance - (of-object "CcView") +(define-function view_world_to_window_distance (c-name "cc_view_world_to_window_distance") (return-type "none") (parameters - '("gdouble" "x") - '("gdouble" "y") + '("CcView*" "self") + '("gdouble*" "x") + '("gdouble*" "y") ) ) @@ -1034,18 +1251,13 @@ ;; From ../ccc/cc-view-png.h -(define-function cc_view_png_get_type - (c-name "cc_view_png_get_type") - (return-type "GType") -) - -(define-function cc_view_png_new +(define-function view_png_new + (in-module "Cc") (c-name "cc_view_png_new") (is-constructor-of "CcViewPng") - (caller-owns-return #f) (return-type "CcView*") (parameters - '("const-gchar*" "filename") + '("gchar*" "filename") ) ) @@ -1053,15 +1265,10 @@ ;; From ../ccc/cc-view-widget.h -(define-function cc_view_widget_get_type - (c-name "cc_view_widget_get_type") - (return-type "GType") -) - -(define-function cc_view_widget_new +(define-function view_widget_new + (in-module "Cc") (c-name "cc_view_widget_new") (is-constructor-of "CcViewWidget") - (caller-owns-return #f) (return-type "GtkWidget*") ) @@ -1070,12 +1277,12 @@ (c-name "cc_view_widget_new_root") (return-type "GtkWidget*") (parameters - '("CcItem*" "root") + '("CcItem*" "root" null-ok) ) ) (define-method get_center_view - (of-object "CcView") + (of-object "CcViewWidget") (c-name "cc_view_widget_get_center_view") (return-type "gboolean") ) @@ -1103,3 +1310,4 @@ '("CcZoomMode" "zoom_mode") ) ) + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/python/cccanvasmodule.c /tmp/irThAZDHWn/libccc-0.0.5/python/cccanvasmodule.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/python/cccanvasmodule.c 2006-06-26 15:42:20.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/python/cccanvasmodule.c 2007-05-05 23:24:45.000000000 +0100 @@ -1,11 +1,26 @@ #include +#include +#include +#include +#include +#include void pycccanvas_register_classes (PyObject *d); extern PyMethodDef pycccanvas_functions[]; void pycccanvas_add_constants(PyObject *module, const gchar *strip_prefix); +DL_EXPORT(void) initcccanvas(void); + +static void +sink_obj(GObject *object) +{ + if (g_object_is_floating (object)) { + g_object_ref_sink(object); + } +} + DL_EXPORT(void) initcccanvas(void) { @@ -13,6 +28,12 @@ init_pygobject (); + pygobject_register_sinkfunc(CC_TYPE_ITEM, sink_obj); + pygobject_register_sinkfunc(CC_TYPE_BRUSH, sink_obj); + pygobject_register_sinkfunc(CC_TYPE_COLOR, sink_obj); + pygobject_register_sinkfunc(CC_TYPE_PRINTER, sink_obj); + pygobject_register_sinkfunc(CC_TYPE_VIEW_PNG, sink_obj); + m = Py_InitModule ("cccanvas", pycccanvas_functions); d = PyModule_GetDict (m); diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/python/cccanvas.override /tmp/irThAZDHWn/libccc-0.0.5/python/cccanvas.override --- /tmp/vgIwXsgmrf/libccc-0.0.3/python/cccanvas.override 2006-06-26 15:42:20.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/python/cccanvas.override 2007-05-05 21:49:19.000000000 +0100 @@ -17,6 +17,12 @@ void py_foreach_func(CcItem* item, CcView* view, gpointer data); +#define CC_TYPE_COLOR_HSV (cc_color_hsv_get_type()) +#define CC_COLOR_HSV(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR_HSV, CcColorHsv)) + +#define CC_TYPE_COLOR_RGB (cc_color_rgb_get_type()) +#define CC_COLOR_RGB(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_COLOR_RGB, CcColorRgb)) + %% modulename ccc %% @@ -31,6 +37,7 @@ cc_item_render cc_brush_apply cc_color_apply + cc_color_stop %% override cc_d_rect_new kwargs CcDRect *cc_d_rect_new (gdouble x1, gdouble y1, gdouble x2, gdouble y2) { @@ -166,12 +173,13 @@ { static char *kwlist[] = { "x", "y", NULL }; PyObject *pyfound; + PyObject *pyview; CcItem *found = NULL; double x, y, ret; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "dd!:CcItem.distance", kwlist, &x, &y)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Odd!:CcItem.distance", kwlist, &pyview, &x, &y)) return NULL; - ret = cc_item_distance(CC_ITEM(self->obj), x, y, &found); + ret = cc_item_distance(CC_ITEM(self->obj), (CcView const*) CC_VIEW(pyview), x, y, &found); pyfound = pygobject_new(G_OBJECT(found)); @@ -198,7 +206,7 @@ PyObject *pyfunc = cb_data->func; PyObject *arg; - printf(" View %d\n", (int) view); + printf(" View %p\n", view); int i, n_args = PyTuple_Size(pydata); @@ -376,25 +384,6 @@ return PyBool_FromLong(ret); } -%% -override cc_text_new kwargs -static int -_wrap_cc_text_new(PyGObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = { "text", NULL }; - char *text = ""; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|z:CcText.__init__", kwlist, &text)) - return -1; - self->obj = (GObject *)cc_text_new(text); - - if (!self->obj) { - PyErr_SetString(PyExc_RuntimeError, "could not create CcText object"); - return -1; - } - g_object_ref(self->obj); - pygobject_register_wrapper((PyObject *)self); - return 0; -} diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/python/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/python/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/python/Makefile.am 2006-06-26 15:42:20.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/python/Makefile.am 2007-05-05 23:29:10.000000000 +0100 @@ -1,4 +1,9 @@ -INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) +AM_CPPFLAGS=\ + -I$(top_srcdir) \ + -I$(top_srcdir)/ccc \ + $(PYTHON_INCLUDES) \ + $(PYGTK_CFLAGS) \ + $(NULL) defsdir = $(datadir)/pygtk/2.0/defs defs_DATA = cccanvas.defs diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/python/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/python/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/python/Makefile.in 2006-09-03 19:57:17.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/python/Makefile.in 2007-05-05 23:29:59.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,7 @@ @SET_MAKE@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +22,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +35,56 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = python +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(defsdir)" +pkgpyexecLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) +am__DEPENDENCIES_1 = +cccanvas_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_cccanvas_la_OBJECTS = cccanvas_la-cccanvasmodule.lo +nodist_cccanvas_la_OBJECTS = cccanvas_la-cccanvas.lo +cccanvas_la_OBJECTS = $(am_cccanvas_la_OBJECTS) \ + $(nodist_cccanvas_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(cccanvas_la_SOURCES) $(nodist_cccanvas_la_SOURCES) +DIST_SOURCES = $(cccanvas_la_SOURCES) +defsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(defs_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -53,6 +102,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -62,7 +113,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -75,6 +130,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -83,6 +139,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -130,7 +188,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -168,6 +228,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -184,6 +246,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -209,10 +273,10 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = $(pyexecdir)/gtk-2.0 - pkgpythondir = $(pyexecdir)/gtk-2.0 prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -223,13 +287,16 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/ccc \ + $(PYTHON_INCLUDES) \ + $(PYGTK_CFLAGS) \ + $(NULL) defsdir = $(datadir)/pygtk/2.0/defs defs_DATA = cccanvas.defs - EXTRA_DIST = $(defs_DATA) cccanvas.override - common_ldflags = -module -avoid-version # libcccanvas binding @@ -241,71 +308,63 @@ cccanvas_la_SOURCES = cccanvasmodule.c nodist_cccanvas_la_SOURCES = cccanvas.c CLEANFILES = cccanvas.c -subdir = python -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) - -cccanvas_la_DEPENDENCIES = -am_cccanvas_la_OBJECTS = cccanvas_la-cccanvasmodule.lo -nodist_cccanvas_la_OBJECTS = cccanvas_la-cccanvas.lo -cccanvas_la_OBJECTS = $(am_cccanvas_la_OBJECTS) \ - $(nodist_cccanvas_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cccanvas_la-cccanvas.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/cccanvas_la-cccanvasmodule.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(cccanvas_la_SOURCES) -DATA = $(defs_DATA) - -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(cccanvas_la_SOURCES) $(nodist_cccanvas_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .defs .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu python/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -pkgpyexecLTLIBRARIES_INSTALL = $(INSTALL) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgpyexecdir) + test -z "$(pkgpyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkgpyexecdir)" @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkgpyexecdir)/$$f"; \ - $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkgpyexecdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ else :; fi; \ done uninstall-pkgpyexecLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pkgpyexecdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pkgpyexecdir)/$$p; \ + @set -x; list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \ done clean-pkgpyexecLTLIBRARIES: -test -z "$(pkgpyexec_LTLIBRARIES)" || rm -f $(pkgpyexec_LTLIBRARIES) @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -313,7 +372,7 @@ $(LINK) -rpath $(pkgpyexecdir) $(cccanvas_la_LDFLAGS) $(cccanvas_la_OBJECTS) $(cccanvas_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -322,103 +381,39 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cccanvas_la-cccanvasmodule.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - -cccanvas_la-cccanvasmodule.o: cccanvasmodule.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvasmodule.o -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" \ -@am__fastdepCC_TRUE@ -c -o cccanvas_la-cccanvasmodule.o `test -f 'cccanvasmodule.c' || echo '$(srcdir)/'`cccanvasmodule.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" "$(DEPDIR)/cccanvas_la-cccanvasmodule.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cccanvasmodule.c' object='cccanvas_la-cccanvasmodule.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cccanvas_la-cccanvasmodule.Po' tmpdepfile='$(DEPDIR)/cccanvas_la-cccanvasmodule.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvasmodule.o `test -f 'cccanvasmodule.c' || echo '$(srcdir)/'`cccanvasmodule.c - -cccanvas_la-cccanvasmodule.obj: cccanvasmodule.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvasmodule.obj -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" \ -@am__fastdepCC_TRUE@ -c -o cccanvas_la-cccanvasmodule.obj `if test -f 'cccanvasmodule.c'; then $(CYGPATH_W) 'cccanvasmodule.c'; else $(CYGPATH_W) '$(srcdir)/cccanvasmodule.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" "$(DEPDIR)/cccanvas_la-cccanvasmodule.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cccanvasmodule.c' object='cccanvas_la-cccanvasmodule.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cccanvas_la-cccanvasmodule.Po' tmpdepfile='$(DEPDIR)/cccanvas_la-cccanvasmodule.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvasmodule.obj `if test -f 'cccanvasmodule.c'; then $(CYGPATH_W) 'cccanvasmodule.c'; else $(CYGPATH_W) '$(srcdir)/cccanvasmodule.c'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< cccanvas_la-cccanvasmodule.lo: cccanvasmodule.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvasmodule.lo -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" \ -@am__fastdepCC_TRUE@ -c -o cccanvas_la-cccanvasmodule.lo `test -f 'cccanvasmodule.c' || echo '$(srcdir)/'`cccanvasmodule.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" "$(DEPDIR)/cccanvas_la-cccanvasmodule.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvasmodule.lo -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" -c -o cccanvas_la-cccanvasmodule.lo `test -f 'cccanvasmodule.c' || echo '$(srcdir)/'`cccanvasmodule.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo" "$(DEPDIR)/cccanvas_la-cccanvasmodule.Plo"; else rm -f "$(DEPDIR)/cccanvas_la-cccanvasmodule.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cccanvasmodule.c' object='cccanvas_la-cccanvasmodule.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cccanvas_la-cccanvasmodule.Plo' tmpdepfile='$(DEPDIR)/cccanvas_la-cccanvasmodule.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvasmodule.lo `test -f 'cccanvasmodule.c' || echo '$(srcdir)/'`cccanvasmodule.c - -cccanvas_la-cccanvas.o: cccanvas.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvas.o -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" \ -@am__fastdepCC_TRUE@ -c -o cccanvas_la-cccanvas.o `test -f 'cccanvas.c' || echo '$(srcdir)/'`cccanvas.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" "$(DEPDIR)/cccanvas_la-cccanvas.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cccanvas.c' object='cccanvas_la-cccanvas.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cccanvas_la-cccanvas.Po' tmpdepfile='$(DEPDIR)/cccanvas_la-cccanvas.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvas.o `test -f 'cccanvas.c' || echo '$(srcdir)/'`cccanvas.c - -cccanvas_la-cccanvas.obj: cccanvas.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvas.obj -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" \ -@am__fastdepCC_TRUE@ -c -o cccanvas_la-cccanvas.obj `if test -f 'cccanvas.c'; then $(CYGPATH_W) 'cccanvas.c'; else $(CYGPATH_W) '$(srcdir)/cccanvas.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" "$(DEPDIR)/cccanvas_la-cccanvas.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cccanvas.c' object='cccanvas_la-cccanvas.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cccanvas_la-cccanvas.Po' tmpdepfile='$(DEPDIR)/cccanvas_la-cccanvas.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvas.obj `if test -f 'cccanvas.c'; then $(CYGPATH_W) 'cccanvas.c'; else $(CYGPATH_W) '$(srcdir)/cccanvas.c'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvasmodule.lo `test -f 'cccanvasmodule.c' || echo '$(srcdir)/'`cccanvasmodule.c cccanvas_la-cccanvas.lo: cccanvas.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvas.lo -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" \ -@am__fastdepCC_TRUE@ -c -o cccanvas_la-cccanvas.lo `test -f 'cccanvas.c' || echo '$(srcdir)/'`cccanvas.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" "$(DEPDIR)/cccanvas_la-cccanvas.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -MT cccanvas_la-cccanvas.lo -MD -MP -MF "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" -c -o cccanvas_la-cccanvas.lo `test -f 'cccanvas.c' || echo '$(srcdir)/'`cccanvas.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo" "$(DEPDIR)/cccanvas_la-cccanvas.Plo"; else rm -f "$(DEPDIR)/cccanvas_la-cccanvas.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cccanvas.c' object='cccanvas_la-cccanvas.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/cccanvas_la-cccanvas.Plo' tmpdepfile='$(DEPDIR)/cccanvas_la-cccanvas.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvas.lo `test -f 'cccanvas.c' || echo '$(srcdir)/'`cccanvas.c +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cccanvas_la_CFLAGS) $(CFLAGS) -c -o cccanvas_la-cccanvas.lo `test -f 'cccanvas.c' || echo '$(srcdir)/'`cccanvas.c mostlyclean-libtool: -rm -f *.lo @@ -429,33 +424,24 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -defsDATA_INSTALL = $(INSTALL_DATA) install-defsDATA: $(defs_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(defsdir) + test -z "$(defsdir)" || $(mkdir_p) "$(DESTDIR)$(defsdir)" @list='$(defs_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(defsDATA_INSTALL) $$d$$p $(DESTDIR)$(defsdir)/$$f"; \ - $(defsDATA_INSTALL) $$d$$p $(DESTDIR)$(defsdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(defsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defsdir)/$$f'"; \ + $(defsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defsdir)/$$f"; \ done uninstall-defsDATA: @$(NORMAL_UNINSTALL) @list='$(defs_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(defsdir)/$$f"; \ - rm -f $(DESTDIR)$(defsdir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(defsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(defsdir)/$$f"; \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -464,6 +450,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -475,10 +462,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -501,10 +489,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -518,7 +502,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -536,9 +520,10 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(pkgpyexecdir) $(DESTDIR)$(defsdir) + for dir in "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(defsdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -559,7 +544,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -579,6 +564,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -617,15 +604,16 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-pkgpyexecLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-defsDATA \ - install-exec install-exec-am install-info install-info-am \ - install-man install-pkgpyexecLTLIBRARIES install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-defsDATA \ - uninstall-info-am uninstall-pkgpyexecLTLIBRARIES + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-defsDATA install-exec install-exec-am install-info \ + install-info-am install-man install-pkgpyexecLTLIBRARIES \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-defsDATA uninstall-info-am \ + uninstall-pkgpyexecLTLIBRARIES cccanvas.c: cccanvas.defs cccanvas.override diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/README /tmp/irThAZDHWn/libccc-0.0.5/README --- /tmp/vgIwXsgmrf/libccc-0.0.3/README 2006-06-13 12:02:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/README 2006-11-26 01:28:12.000000000 +0000 @@ -0,0 +1,27 @@ + + README for libccc + ================= + +This is criawips' cairo-based canvas (CCC). It was designed to be used as a +replacement for Gnome Canvas in my presentaiton application. It tries to remain +as easy to be used as Gnome Canvas but also to solve the problems that the +current Gnome Canvas API is infected with. + +Requirements: +============= + * Glib 2.10.0 + * GTK+ 2.8.0 + * cairo 1.2.0 + * check (optional) + * gtk-doc (optional) + +Features: +========= + + * Gnome Canvas like API + * but now using things like gnome_canvas_item_new() + * finer grained event handling API + * every canvas item can be a container + * model/view split + * access to events on the view widget (no need for GnomeCanvasAcetate) + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ruby/ccc.c /tmp/irThAZDHWn/libccc-0.0.5/ruby/ccc.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/ruby/ccc.c 2006-06-13 12:02:02.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ruby/ccc.c 2007-04-20 09:54:44.000000000 +0100 @@ -25,6 +25,6 @@ void Init_ccc(void) { - VALUE mod_ccc = rb_define_module("CCCanvas"); + VALUE mod_ccc = rb_define_module("Ccc"); } diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ruby/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/ruby/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/ruby/Makefile.am 2006-06-13 12:02:02.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ruby/Makefile.am 2006-11-25 13:13:55.000000000 +0000 @@ -26,7 +26,7 @@ $(CC) -shared -o $@ $^ $(AM_CPPFLAGS) %.o: %.c - $(CC) -c -o $@ $(AM_CPPFLAGS) $< + $(CC) -c -fPIC -o $@ $(AM_CPPFLAGS) $< EXTRA_DIST=ccc.rb \ $(ccc_so_SOURCES) \ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/ruby/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/ruby/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/ruby/Makefile.in 2006-09-03 19:57:18.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/ruby/Makefile.in 2007-05-05 23:17:43.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,7 +21,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,8 +34,30 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ @WITH_RUBY_TRUE@am__append_1 = ccc.so +subdir = ruby +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(moduledir)" +moduleSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(module_SCRIPTS) +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -54,6 +75,8 @@ CCC_LIBS = @CCC_LIBS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -63,7 +86,11 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -76,6 +103,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -84,6 +112,8 @@ GREP = @GREP@ GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ HTML_DIR = @HTML_DIR@ INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ @@ -131,7 +161,9 @@ MAKEINFO = @MAKEINFO@ MILESTONE = @MILESTONE@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -169,6 +201,8 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ @@ -185,6 +219,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -210,6 +246,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ @@ -229,12 +266,9 @@ $(NULL) ccc_so_OBJECTS = $(ccc_so_SOURCES:.c=.o) - RUBY_MODULES = $(am__append_1) - @WITH_RUBY_TRUE@module_SCRIPTS = ccc.rb @WITH_RUBY_TRUE@moduledir = $(RUBY_LIBDIR) - AM_CPPFLAGS = \ $(RUBY_CFLAGS) \ $(CCC_CFLAGS) \ @@ -242,7 +276,6 @@ -I$(top_srcdir)/ccc \ $(NULL) - EXTRA_DIST = ccc.rb \ $(ccc_so_SOURCES) \ $(NULL) @@ -252,33 +285,47 @@ $(ccc_so_OBJECTS) \ $(NULL) -subdir = ruby -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/cc-config.h -CONFIG_CLEAN_FILES = -SCRIPTS = $(module_SCRIPTS) - -DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ruby/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu ruby/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -moduleSCRIPT_INSTALL = $(INSTALL_SCRIPT) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-moduleSCRIPTS: $(module_SCRIPTS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(moduledir) + test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" @list='$(module_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(moduleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(moduledir)/$$f"; \ - $(moduleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(moduledir)/$$f; \ + echo " $(moduleSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ + $(moduleSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(moduledir)/$$f"; \ else :; fi; \ done @@ -286,8 +333,8 @@ @$(NORMAL_UNINSTALL) @list='$(module_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(moduledir)/$$f"; \ - rm -f $(DESTDIR)$(moduledir)/$$f; \ + echo " rm -f '$(DESTDIR)$(moduledir)/$$f'"; \ + rm -f "$(DESTDIR)$(moduledir)/$$f"; \ done mostlyclean-libtool: @@ -305,10 +352,6 @@ ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -322,7 +365,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -340,9 +383,10 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(moduledir) + for dir in "$(DESTDIR)$(moduledir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -363,7 +407,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -380,6 +424,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -414,13 +460,14 @@ .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-moduleSCRIPTS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-moduleSCRIPTS + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-moduleSCRIPTS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-info-am \ + uninstall-moduleSCRIPTS all: $(RUBY_MODULES) @@ -429,7 +476,7 @@ $(CC) -shared -o $@ $^ $(AM_CPPFLAGS) %.o: %.c - $(CC) -c -o $@ $(AM_CPPFLAGS) $< + $(CC) -c -fPIC -o $@ $(AM_CPPFLAGS) $< # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/callgrind-helpers.h /tmp/irThAZDHWn/libccc-0.0.5/test/callgrind-helpers.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/callgrind-helpers.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/callgrind-helpers.h 2007-04-23 23:03:32.000000000 +0100 @@ -0,0 +1,84 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CALLGRIND_HELPERS_H +#define CALLGRIND_HELPERS_H + +#include +#include + +#ifdef HAVE_CALLGRIND +#include +#endif + +#ifndef CALLGRIND_DUMP_STATS +#define CALLGRIND_DUMP_STATS G_STMT_START {} G_STMT_END; +#endif + +#ifndef CALLGRIND_DUMP_STATS_AT +#define CALLGRIND_DUMP_STATS_AT(loc) G_STMT_START {} G_STMT_END; +#endif + +#ifndef CALLGRIND_ZERO_STATS +#define CALLGRIND_ZERO_STATS G_STMT_START {} G_STMT_END; +#endif + +#ifndef CALLGRIND_TOGGLE_COLLECT +#define CALLGRIND_TOGGLE_COLLECT G_STMT_START {} G_STMT_END; +#endif + +#ifndef CALLGRIND_START_INSTRUMENTATION +#define CALLGRIND_START_INSTRUMENTATION G_STMT_START {} G_STMT_END; +#endif + +#ifndef CALLGRIND_STOP_INSTRUMENTATION +#define CALLGRIND_STOP_INSTRUMENTATION G_STMT_START {} G_STMT_END; +#endif + +/* Manual: + * + * Usually you want to debug test cases like this: + * + * START_TEST(test_some_feature) + * { + * // last preparations + * + * CALLGRIND_START_INSTRUMENTATION; + * CALLGRIND_ZERO_STATS; + * // perform the real test + * CALLGRIND_DUMP_STATS_AT(test_some_feature); + * CALLGRIND_STOP_INSTRUMENTATION; + * + * fail_unless (condition); + * + * // cleanup + * } + * END_TEST + * + * This will allow the callgrind-m-ccc script to actually collect pretty useful + * data for each of the tests. + */ + +G_END_DECLS + +#endif /* !CALLGRIND_HELPERS_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/cc-test-view.c /tmp/irThAZDHWn/libccc-0.0.5/test/cc-test-view.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/cc-test-view.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/cc-test-view.c 2007-05-05 15:00:43.000000000 +0100 @@ -0,0 +1,195 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "cc-test-view.h" + +#include + +struct CcTestViewPrivate { + CcItem * root; + gdouble zoom; +}; +#define P(i) (G_TYPE_INSTANCE_GET_PRIVATE((i), CC_TYPE_TEST_VIEW, struct CcTestViewPrivate)) + +CcView* +cc_test_view_new(void) +{ + return g_object_new(CC_TYPE_TEST_VIEW, NULL); +} + +gboolean +cc_test_view_motion_notify(CcTestView* self, + gdouble x, + gdouble y) +{ + gboolean retval = FALSE; + g_warning("FIXME: implement cc_test_view_motion_notify()"); + return retval; +} + +/* GType */ +static void test_view_init_item_view(CcItemViewIface* iface); +static void test_view_init_view (CcViewIface * iface); +G_DEFINE_TYPE_WITH_CODE(CcTestView, cc_test_view, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE(CC_TYPE_ITEM_VIEW, test_view_init_item_view); + G_IMPLEMENT_INTERFACE(CC_TYPE_VIEW, test_view_init_view)); + +enum { + PROP_0, + PROP_FOCUS, + PROP_ROOT, + PROP_SCROLLED_REGION, + PROP_ZOOM, + PROP_ZOOM_MODE +}; + +static void +cc_test_view_init(CcTestView* self G_GNUC_UNUSED) +{} + +static void +test_view_dispose(GObject* object) +{ + if(P(object)->root) { + cc_view_set_root(CC_VIEW(object), NULL); + } + + G_OBJECT_CLASS(cc_test_view_parent_class)->dispose(object); +} + +static void +test_view_get_property(GObject * object, + guint prop_id, + GValue * value, + GParamSpec* pspec) +{ + switch(prop_id) { + case PROP_FOCUS: +#warning "FIXME: implement focus property" + g_warning("FIXME: implement focus for CcTestView"); + break; + case PROP_ROOT: + g_value_set_object(value, P(object)->root); + break; + case PROP_SCROLLED_REGION: +#warning "FIXME: implement scrolled region property" + g_warning("FIXME: implement scrolled region for CcTestView"); + break; + case PROP_ZOOM: + g_value_set_double(value, P(object)->zoom); + break; + case PROP_ZOOM_MODE: +#warning "FIXME: implement zoom mode property" + g_warning("FIXME: implement zoom mode for CcTestView"); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static void +test_view_set_root(CcTestView* self, + CcItem * root) +{ + g_return_if_fail(CC_IS_TEST_VIEW(self)); + g_return_if_fail(!root || CC_IS_ITEM(root)); + + if(P(self)->root == root) { + return; + } + + if(P(self)->root) { + cc_item_view_unregister (CC_ITEM_VIEW (self), P(self)->root); + g_object_unref(P(self)->root); + P(self)->root = NULL; + } + + if(root) { + P(self)->root = g_object_ref(root); + cc_item_view_register (CC_ITEM_VIEW (self), P(self)->root); + } + + g_object_notify(G_OBJECT(self), "root"); +} + +static void +test_view_set_property(GObject * object, + guint prop_id, + GValue const* value, + GParamSpec * pspec) +{ + switch(prop_id) { + case PROP_FOCUS: +#warning "FIXME: implement focus property" + g_warning("FIXME: implement focus for CcTestView"); + break; + case PROP_ROOT: + test_view_set_root(CC_TEST_VIEW(object), g_value_get_object(value)); + break; + case PROP_SCROLLED_REGION: +#warning "FIXME: implement scrolled region property" + g_warning("FIXME: implement scrolled region for CcTestView"); + break; + case PROP_ZOOM: + P(object)->zoom = g_value_get_double(value); + g_object_notify(object, "zoom"); + break; + case PROP_ZOOM_MODE: +#warning "FIXME: implement zoom mode property" + g_warning("FIXME: implement zoom mode for CcTestView"); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +static void +cc_test_view_class_init(CcTestViewClass* self_class) +{ + GObjectClass* object_class = G_OBJECT_CLASS(self_class); + + object_class->dispose = test_view_dispose; + object_class->get_property = test_view_get_property; + object_class->set_property = test_view_set_property; + + /* CcTestViewClass */ + g_type_class_add_private(self_class, sizeof(struct CcTestViewPrivate)); + + /* CcViewIface */ + _cc_view_install_property(object_class, PROP_ROOT, + PROP_SCROLLED_REGION, PROP_ZOOM, + PROP_ZOOM_MODE, PROP_FOCUS); +} + +/* CcViewIface */ +static void +test_view_init_item_view(CcItemViewIface* iface G_GNUC_UNUSED) +{} + +/* CcViewIface */ +static void +test_view_init_view(CcViewIface* iface G_GNUC_UNUSED) +{} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/cc-test-view.h /tmp/irThAZDHWn/libccc-0.0.5/test/cc-test-view.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/cc-test-view.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/cc-test-view.h 2007-04-23 23:03:32.000000000 +0100 @@ -0,0 +1,51 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef CC_TEST_VIEW_H +#define CC_TEST_VIEW_H + +#include + +G_BEGIN_DECLS + +typedef GObject CcTestView; +typedef GObjectClass CcTestViewClass; + +#define CC_TYPE_TEST_VIEW (cc_test_view_get_type()) +#define CC_TEST_VIEW(i) (G_TYPE_CHECK_INSTANCE_CAST((i), CC_TYPE_TEST_VIEW, CcTestView)) +#define CC_TEST_VIEW_CLASS(c) (G_TYPE_CHECK_CLASS_CAST((c), CC_TYPE_TEST_VIEW, CcTestViewClass)) +#define CC_IS_TEST_VIEW(i) (G_TYPE_CHECK_INSTANCE_TYPE((i), CC_TYPE_TEST_VIEW)) +#define CC_IS_TEST_VIEW_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE((c), CC_TYPE_TEST_VIEW)) +#define CC_TEST_VIEW_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS((i), CC_TYPE_TEST_VIEW, CcTestView)) + +#define CC_TYPE_MOCK_VIEW CC_TYPE_TEST_VIEW + +GType cc_test_view_get_type (void); +CcView* cc_test_view_new (void); +gboolean cc_test_view_motion_notify(CcTestView* view, + gdouble x, + gdouble y); + +G_END_DECLS + +#endif /* !CC_TEST_VIEW_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/glib-helpers.h /tmp/irThAZDHWn/libccc-0.0.5/test/glib-helpers.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/glib-helpers.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/glib-helpers.h 2006-11-04 14:19:22.000000000 +0000 @@ -0,0 +1,74 @@ +/* this file is part of criawips, a gnome presentation application + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2005,2006 Sven Herzberg + * + * This program 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.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef GLIB_HELPERS_H +#define GLIB_HELPERS_H + +#include + +G_BEGIN_DECLS + +#ifndef G_COMPARE_FUNC +#define G_COMPARE_FUNC(func) ((GCompareFunc)(func)) +#endif /* !G_COMPARE_FUNC */ + +#ifndef G_DESTROY_NOTIFY +#define G_DESTROY_NOTIFY(func) ((GDestroyNotify)(func)) +#endif /* !G_DESTROY_NOTIFY */ + +#ifndef G_FUNC +#define G_FUNC(func) ((GFunc)(func)) +#endif /* !GFUNC */ + +#ifndef GH_FUNC +#define GH_FUNC(func) ((GHFunc)(func)) +#endif /* !GH_FUNC */ + +#ifndef G_SOURCE_FUNC +#define G_SOURCE_FUNC(func) ((GSourceFunc)(func)) +#endif /* !G_SOURCE_FUNC */ + +#ifndef G_COMPARE_FUNC +#define G_COMPARE_FUNC(func) ((GCompareFunc)(func)) +#endif /* !G_COMPARE_FUNC */ + +#ifndef GHR_FUNC +#define GHR_FUNC(func) ((GHRFunc)(func)) +#endif /* !GHR_FUNC */ + +#if GLIB_MAJOR_VERSION < 3 && GLIB_MINOR_VERSION < 9 +# define g_value_get_gtype(value) g_value_get_uint(value) +# define g_value_set_gtype(value, type) g_value_set_uint(value, type) +# define g_param_spec_gtype(nick, name, blurb, is_a_type, flags) \ + g_param_spec_uint(nick, name, blurb, 0, G_MAXUINT, 0, flags) +#endif + +GList* g_list_copy_reversed (GList* list); +void g_list_foreach_reverse(GList* list, GFunc func, gpointer data); + +gsize g_utf8_length_next(gchar const* utf8); + +G_END_DECLS + +#endif /* GLIB_HELPERS_H */ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/gtk-helpers.c /tmp/irThAZDHWn/libccc-0.0.5/test/gtk-helpers.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/gtk-helpers.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/gtk-helpers.c 2006-11-04 14:19:19.000000000 +0000 @@ -0,0 +1,105 @@ +/* this file is part of criawips, a gnome presentation application + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2005,2006 Sven Herzberg + * + * This program 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 program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include "gtk-helpers.h" + +#include + +void +gtk_main_flush(void) { + while(gtk_events_pending()) { + gtk_main_iteration(); + } +} + +static void +_hfc_gtk_tree_cell_data_func_int(GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, gpointer data) { + guint col = GPOINTER_TO_INT(data); + guint value; + gchar* text; + + gtk_tree_model_get(model, iter, col, &value, -1); + text = g_strdup_printf("%u", value); + g_object_set(renderer, "text", text, NULL); + g_free(text); +} +GtkTreeCellDataFunc hfc_gtk_tree_cell_data_func_int = _hfc_gtk_tree_cell_data_func_int; + +void +gtk_widget_get_extends(GtkWidget* widget, gint* x, gint* y, gint* w, gint* h) { + GdkWindow* window = widget->window; + gdk_window_get_origin(window, x, y); + + if(x) { + *x += widget->allocation.x; + } + + if(y) { + *y += widget->allocation.y; + } + + if(w) { + *w = widget->allocation.width; + } + + if(h) { + *h = widget->allocation.height; + } +} + +void +gtk_widget_hide_now(GtkWidget* self) { + g_return_if_fail(GTK_IS_WIDGET(self)); + + gtk_widget_hide(self); + gtk_main_flush(); +} + +void +gtk_widget_set_cursor(GtkWidget* self, GdkCursorType type) { + GdkCursor * cursor = NULL; + GdkDisplay* display = NULL; + + g_return_if_fail(GTK_IS_WIDGET(self)); + + display = g_object_ref(gtk_widget_get_display(self)); + cursor = gdk_cursor_new_for_display(display, type); + gdk_window_set_cursor(self->window, cursor); + gdk_display_flush(display); + gdk_cursor_unref(cursor); + g_object_unref(display); +} + +gchar* +gtk_window_get_geometry(GtkWindow* self) { + int x,y,w,h; + + g_return_val_if_fail(GTK_IS_WINDOW(self), NULL); + g_return_val_if_fail(gtk_window_get_gravity(self) == GDK_GRAVITY_NORTH_WEST, NULL); + + gtk_window_get_position(self, &x, &y); + gtk_window_get_size(self, &w, &h); + + return g_strdup_printf ("%dx%d+%d+%d", w, h, x, y); +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/gtk-helpers.h /tmp/irThAZDHWn/libccc-0.0.5/test/gtk-helpers.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/gtk-helpers.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/gtk-helpers.h 2006-11-04 14:19:19.000000000 +0000 @@ -0,0 +1,48 @@ +/* this file is part of criawips, a gnome presentation application + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2005,2006 Sven Herzberg + * + * This program 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 program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#ifndef GTK_HELPERS_H +#define GTK_HELPERS_H + +#include +#include + +#include "glib-helpers.h" + +G_BEGIN_DECLS + +#define GTK_CLIPBOARD_TEXT_RECEIVED_FUNC(f) (GtkClipboardTextReceivedFunc)(f) + +extern GtkTreeCellDataFunc hfc_gtk_tree_cell_data_func_int; + +void gtk_widget_get_extends(GtkWidget* widget, gint* x, gint* y, gint* w, gint* h); +void gtk_widget_hide_now(GtkWidget* self); +void gtk_main_flush (void); + +void gtk_widget_set_cursor (GtkWidget* self, GdkCursorType type); +gchar* gtk_window_get_geometry(GtkWindow* self); + +G_END_DECLS + +#endif /* GTK_HELPERS_H */ + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/Makefile.am /tmp/irThAZDHWn/libccc-0.0.5/test/Makefile.am --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/Makefile.am 2007-05-05 23:17:06.000000000 +0100 @@ -0,0 +1,96 @@ +if HAVE_CHECK +TESTS=\ + m-dummy \ + m-mock \ + m-ccc \ + $(NULL) +noinst_PROGRAMS=\ + $(TESTS) +noinst_LTLIBRARIES=\ + libmock.la + +XFAIL_TESTS=m-ccc + +libmock_la_SOURCES=\ + callgrind-helpers.h \ + cc-test-view.c \ + cc-test-view.h \ + mock-logger.c \ + mock-logger.h \ + $(NULL) + +m_mock_SOURCES=\ + m-mock.c \ + s-mock-logger.c \ + s-mock-logger.h \ + t-mock-logger-init.c \ + t-mock-logger-properties.c \ + s-mock-view.c \ + s-mock-view.h \ + t-mock-view-root.c \ + $(NULL) + +m_ccc_SOURCES=\ + glib-helpers.h \ + gtk-helpers.c \ + gtk-helpers.h \ + m-ccc.c \ + s-camera.c \ + s-camera.h \ + s-cell-renderer.c \ + s-cell-renderer.h \ + s-circle.c \ + s-circle.h \ + t-circle-391646.c \ + s-item.c \ + s-item.h \ + t-item-bounds-updates.c \ + t-item-parent.c \ + s-item-view.c \ + s-item-view.h \ + t-item-view-added.c \ + s-line.c \ + s-line.h \ + t-line-all-bounds.c \ + s-printer.c \ + s-printer.h \ + s-text.c \ + s-text.h \ + t-text-dirty.c \ + t-text-utf8-editing.c \ + s-unit.c \ + s-unit.h \ + t-unit-allocation.c \ + s-view.c \ + s-view.h \ + t-view-transformations.c \ + s-view-png.c \ + s-view-png.h \ + s-view-widget.c \ + s-view-widget.h \ + t-view-widget-focus.c \ + t-item-crossing.c \ + t-item-dirty.c \ + t-item-distance.c \ + t-item-view-signals.c \ + t-item-view-data.c \ + $(NULL) +LDADD=\ + $(CCC_LIBS) \ + $(CHECK_LIBS) \ + libmock.la \ + ../ccc/libccc-0.1.la +AM_CPPFLAGS=\ + $(CCC_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/ccc \ + $(NULL) +endif + +# check-local: check-valgrind + +check-valgrind: + @echo "Running tests with valgrind:" + @$(MAKE) TESTS_ENVIRONMENT="G_SLICE=always-malloc G_DEBUG=gc-friendly $(top_builddir)/libtool --mode=execute valgrind --leak-check=full -q" \ + check-TESTS + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/Makefile.in /tmp/irThAZDHWn/libccc-0.0.5/test/Makefile.in --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/Makefile.in 2007-05-05 23:17:43.000000000 +0100 @@ -0,0 +1,819 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@HAVE_CHECK_TRUE@noinst_PROGRAMS = $(am__EXEEXT_1) +subdir = test +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ + $(top_srcdir)/macros/herzi-cflags.m4 \ + $(top_srcdir)/macros/herzi-gettext.m4 \ + $(top_srcdir)/macros/herzi-gprof.m4 \ + $(top_srcdir)/macros/herzi-prefix.m4 \ + $(top_srcdir)/macros/herzi-ruby.m4 \ + $(top_srcdir)/macros/python.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/cc-config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libmock_la_LIBADD = +am__libmock_la_SOURCES_DIST = callgrind-helpers.h cc-test-view.c \ + cc-test-view.h mock-logger.c mock-logger.h +@HAVE_CHECK_TRUE@am_libmock_la_OBJECTS = cc-test-view.lo \ +@HAVE_CHECK_TRUE@ mock-logger.lo +libmock_la_OBJECTS = $(am_libmock_la_OBJECTS) +@HAVE_CHECK_TRUE@am_libmock_la_rpath = +@HAVE_CHECK_TRUE@am__EXEEXT_1 = m-dummy$(EXEEXT) m-mock$(EXEEXT) \ +@HAVE_CHECK_TRUE@ m-ccc$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) +am__m_ccc_SOURCES_DIST = glib-helpers.h gtk-helpers.c gtk-helpers.h \ + m-ccc.c s-camera.c s-camera.h s-cell-renderer.c \ + s-cell-renderer.h s-circle.c s-circle.h t-circle-391646.c \ + s-item.c s-item.h t-item-bounds-updates.c t-item-parent.c \ + s-item-view.c s-item-view.h t-item-view-added.c s-line.c \ + s-line.h t-line-all-bounds.c s-printer.c s-printer.h s-text.c \ + s-text.h t-text-dirty.c t-text-utf8-editing.c s-unit.c \ + s-unit.h t-unit-allocation.c s-view.c s-view.h \ + t-view-transformations.c s-view-png.c s-view-png.h \ + s-view-widget.c s-view-widget.h t-view-widget-focus.c \ + t-item-crossing.c t-item-dirty.c t-item-distance.c \ + t-item-view-signals.c t-item-view-data.c +@HAVE_CHECK_TRUE@am_m_ccc_OBJECTS = gtk-helpers.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ m-ccc.$(OBJEXT) s-camera.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-cell-renderer.$(OBJEXT) s-circle.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-circle-391646.$(OBJEXT) s-item.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-bounds-updates.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-parent.$(OBJEXT) s-item-view.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-view-added.$(OBJEXT) s-line.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-line-all-bounds.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-printer.$(OBJEXT) s-text.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-text-dirty.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-text-utf8-editing.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-unit.$(OBJEXT) t-unit-allocation.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-view.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-view-transformations.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-view-png.$(OBJEXT) s-view-widget.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-view-widget-focus.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-crossing.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-dirty.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-distance.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-view-signals.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-item-view-data.$(OBJEXT) +m_ccc_OBJECTS = $(am_m_ccc_OBJECTS) +m_ccc_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +@HAVE_CHECK_TRUE@m_ccc_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1) libmock.la \ +@HAVE_CHECK_TRUE@ ../ccc/libccc-0.1.la +m_dummy_SOURCES = m-dummy.c +m_dummy_OBJECTS = m-dummy.$(OBJEXT) +m_dummy_LDADD = $(LDADD) +@HAVE_CHECK_TRUE@m_dummy_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1) libmock.la \ +@HAVE_CHECK_TRUE@ ../ccc/libccc-0.1.la +am__m_mock_SOURCES_DIST = m-mock.c s-mock-logger.c s-mock-logger.h \ + t-mock-logger-init.c t-mock-logger-properties.c s-mock-view.c \ + s-mock-view.h t-mock-view-root.c +@HAVE_CHECK_TRUE@am_m_mock_OBJECTS = m-mock.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-mock-logger.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-mock-logger-init.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-mock-logger-properties.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ s-mock-view.$(OBJEXT) \ +@HAVE_CHECK_TRUE@ t-mock-view-root.$(OBJEXT) +m_mock_OBJECTS = $(am_m_mock_OBJECTS) +m_mock_LDADD = $(LDADD) +@HAVE_CHECK_TRUE@m_mock_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1) libmock.la \ +@HAVE_CHECK_TRUE@ ../ccc/libccc-0.1.la +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libmock_la_SOURCES) $(m_ccc_SOURCES) m-dummy.c \ + $(m_mock_SOURCES) +DIST_SOURCES = $(am__libmock_la_SOURCES_DIST) \ + $(am__m_ccc_SOURCES_DIST) m-dummy.c $(am__m_mock_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCC_CFLAGS = @CCC_CFLAGS@ +CCC_LIBS = @CCC_LIBS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_LIBS = @CHECK_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEMO_CFLAGS = @DEMO_CFLAGS@ +DEMO_LIBS = @DEMO_LIBS@ +DEPDIR = @DEPDIR@ +DEVELOPER_FALSE = @DEVELOPER_FALSE@ +DEVELOPER_TRUE = @DEVELOPER_TRUE@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_GPROF = @ENABLE_GPROF@ +ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GAPI2_CODEGEN = @GAPI2_CODEGEN@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +HAVE_CHECK_FALSE = @HAVE_CHECK_FALSE@ +HAVE_CHECK_TRUE = @HAVE_CHECK_TRUE@ +HTML_DIR = @HTML_DIR@ +INSIDE_GNOME_COMMON_FALSE = @INSIDE_GNOME_COMMON_FALSE@ +INSIDE_GNOME_COMMON_TRUE = @INSIDE_GNOME_COMMON_TRUE@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_ICONV = @INTLTOOL_ICONV@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MILESTONE = @MILESTONE@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO = @MONO@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_LOCALE_DIR = @PACKAGE_LOCALE_DIR@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_PREFIX = @PACKAGE_PREFIX@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PYGTK_CFLAGS = @PYGTK_CFLAGS@ +PYGTK_CODEGEN = @PYGTK_CODEGEN@ +PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ +PYGTK_LIBS = @PYGTK_LIBS@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RUBY = @RUBY@ +RUBY_ARCHDIR = @RUBY_ARCHDIR@ +RUBY_CFLAGS = @RUBY_CFLAGS@ +RUBY_LIBDIR = @RUBY_LIBDIR@ +RUBY_LIBS = @RUBY_LIBS@ +RUBY_VERSION = @RUBY_VERSION@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_MONO_FALSE = @WITH_MONO_FALSE@ +WITH_MONO_TRUE = @WITH_MONO_TRUE@ +WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ +WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ +WITH_RUBY_FALSE = @WITH_RUBY_FALSE@ +WITH_RUBY_TRUE = @WITH_RUBY_TRUE@ +XARGS = @XARGS@ +XGETTEXT = @XGETTEXT@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +@HAVE_CHECK_TRUE@TESTS = \ +@HAVE_CHECK_TRUE@ m-dummy \ +@HAVE_CHECK_TRUE@ m-mock \ +@HAVE_CHECK_TRUE@ m-ccc \ +@HAVE_CHECK_TRUE@ $(NULL) + +@HAVE_CHECK_TRUE@noinst_LTLIBRARIES = \ +@HAVE_CHECK_TRUE@ libmock.la + +@HAVE_CHECK_TRUE@XFAIL_TESTS = m-ccc +@HAVE_CHECK_TRUE@libmock_la_SOURCES = \ +@HAVE_CHECK_TRUE@ callgrind-helpers.h \ +@HAVE_CHECK_TRUE@ cc-test-view.c \ +@HAVE_CHECK_TRUE@ cc-test-view.h \ +@HAVE_CHECK_TRUE@ mock-logger.c \ +@HAVE_CHECK_TRUE@ mock-logger.h \ +@HAVE_CHECK_TRUE@ $(NULL) + +@HAVE_CHECK_TRUE@m_mock_SOURCES = \ +@HAVE_CHECK_TRUE@ m-mock.c \ +@HAVE_CHECK_TRUE@ s-mock-logger.c \ +@HAVE_CHECK_TRUE@ s-mock-logger.h \ +@HAVE_CHECK_TRUE@ t-mock-logger-init.c \ +@HAVE_CHECK_TRUE@ t-mock-logger-properties.c \ +@HAVE_CHECK_TRUE@ s-mock-view.c \ +@HAVE_CHECK_TRUE@ s-mock-view.h \ +@HAVE_CHECK_TRUE@ t-mock-view-root.c \ +@HAVE_CHECK_TRUE@ $(NULL) + +@HAVE_CHECK_TRUE@m_ccc_SOURCES = \ +@HAVE_CHECK_TRUE@ glib-helpers.h \ +@HAVE_CHECK_TRUE@ gtk-helpers.c \ +@HAVE_CHECK_TRUE@ gtk-helpers.h \ +@HAVE_CHECK_TRUE@ m-ccc.c \ +@HAVE_CHECK_TRUE@ s-camera.c \ +@HAVE_CHECK_TRUE@ s-camera.h \ +@HAVE_CHECK_TRUE@ s-cell-renderer.c \ +@HAVE_CHECK_TRUE@ s-cell-renderer.h \ +@HAVE_CHECK_TRUE@ s-circle.c \ +@HAVE_CHECK_TRUE@ s-circle.h \ +@HAVE_CHECK_TRUE@ t-circle-391646.c \ +@HAVE_CHECK_TRUE@ s-item.c \ +@HAVE_CHECK_TRUE@ s-item.h \ +@HAVE_CHECK_TRUE@ t-item-bounds-updates.c \ +@HAVE_CHECK_TRUE@ t-item-parent.c \ +@HAVE_CHECK_TRUE@ s-item-view.c \ +@HAVE_CHECK_TRUE@ s-item-view.h \ +@HAVE_CHECK_TRUE@ t-item-view-added.c \ +@HAVE_CHECK_TRUE@ s-line.c \ +@HAVE_CHECK_TRUE@ s-line.h \ +@HAVE_CHECK_TRUE@ t-line-all-bounds.c \ +@HAVE_CHECK_TRUE@ s-printer.c \ +@HAVE_CHECK_TRUE@ s-printer.h \ +@HAVE_CHECK_TRUE@ s-text.c \ +@HAVE_CHECK_TRUE@ s-text.h \ +@HAVE_CHECK_TRUE@ t-text-dirty.c \ +@HAVE_CHECK_TRUE@ t-text-utf8-editing.c \ +@HAVE_CHECK_TRUE@ s-unit.c \ +@HAVE_CHECK_TRUE@ s-unit.h \ +@HAVE_CHECK_TRUE@ t-unit-allocation.c \ +@HAVE_CHECK_TRUE@ s-view.c \ +@HAVE_CHECK_TRUE@ s-view.h \ +@HAVE_CHECK_TRUE@ t-view-transformations.c \ +@HAVE_CHECK_TRUE@ s-view-png.c \ +@HAVE_CHECK_TRUE@ s-view-png.h \ +@HAVE_CHECK_TRUE@ s-view-widget.c \ +@HAVE_CHECK_TRUE@ s-view-widget.h \ +@HAVE_CHECK_TRUE@ t-view-widget-focus.c \ +@HAVE_CHECK_TRUE@ t-item-crossing.c \ +@HAVE_CHECK_TRUE@ t-item-dirty.c \ +@HAVE_CHECK_TRUE@ t-item-distance.c \ +@HAVE_CHECK_TRUE@ t-item-view-signals.c \ +@HAVE_CHECK_TRUE@ t-item-view-data.c \ +@HAVE_CHECK_TRUE@ $(NULL) + +@HAVE_CHECK_TRUE@LDADD = \ +@HAVE_CHECK_TRUE@ $(CCC_LIBS) \ +@HAVE_CHECK_TRUE@ $(CHECK_LIBS) \ +@HAVE_CHECK_TRUE@ libmock.la \ +@HAVE_CHECK_TRUE@ ../ccc/libccc-0.1.la + +@HAVE_CHECK_TRUE@AM_CPPFLAGS = \ +@HAVE_CHECK_TRUE@ $(CCC_CFLAGS) \ +@HAVE_CHECK_TRUE@ -I$(top_srcdir) \ +@HAVE_CHECK_TRUE@ -I$(top_srcdir)/ccc \ +@HAVE_CHECK_TRUE@ $(NULL) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu test/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libmock.la: $(libmock_la_OBJECTS) $(libmock_la_DEPENDENCIES) + $(LINK) $(am_libmock_la_rpath) $(libmock_la_LDFLAGS) $(libmock_la_OBJECTS) $(libmock_la_LIBADD) $(LIBS) + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +m-ccc$(EXEEXT): $(m_ccc_OBJECTS) $(m_ccc_DEPENDENCIES) + @rm -f m-ccc$(EXEEXT) + $(LINK) $(m_ccc_LDFLAGS) $(m_ccc_OBJECTS) $(m_ccc_LDADD) $(LIBS) +m-dummy$(EXEEXT): $(m_dummy_OBJECTS) $(m_dummy_DEPENDENCIES) + @rm -f m-dummy$(EXEEXT) + $(LINK) $(m_dummy_LDFLAGS) $(m_dummy_OBJECTS) $(m_dummy_LDADD) $(LIBS) +m-mock$(EXEEXT): $(m_mock_OBJECTS) $(m_mock_DEPENDENCIES) + @rm -f m-mock$(EXEEXT) + $(LINK) $(m_mock_LDFLAGS) $(m_mock_OBJECTS) $(m_mock_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-test-view.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m-ccc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m-dummy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m-mock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mock-logger.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-camera.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-cell-renderer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-circle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-item-view.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-item.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-line.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-mock-logger.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-mock-view.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-printer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-unit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-view-png.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-view-widget.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s-view.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-circle-391646.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-bounds-updates.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-crossing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-dirty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-distance.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-parent.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-view-added.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-view-data.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-item-view-signals.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-line-all-bounds.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-mock-logger-init.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-mock-logger-properties.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-mock-view-root.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-text-dirty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-text-utf8-editing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-unit-allocation.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-view-transformations.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-view-widget-focus.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am + + +# check-local: check-valgrind + +check-valgrind: + @echo "Running tests with valgrind:" + @$(MAKE) TESTS_ENVIRONMENT="G_SLICE=always-malloc G_DEBUG=gc-friendly $(top_builddir)/libtool --mode=execute valgrind --leak-check=full -q" \ + check-TESTS +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/m-ccc.c /tmp/irThAZDHWn/libccc-0.0.5/test/m-ccc.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/m-ccc.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/m-ccc.c 2007-05-05 15:00:44.000000000 +0100 @@ -0,0 +1,83 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-camera.h" +#include "s-cell-renderer.h" +#include "s-circle.h" +#include "s-item.h" +#include "s-item-view.h" +#include "s-line.h" +#include "s-printer.h" +#include "s-text.h" +#include "s-unit.h" +#include "s-view.h" +#include "s-view-png.h" +#include "s-view-widget.h" + +#include +#include + +static gboolean no_fork = FALSE; + +static GOptionEntry entries[] = { + {"no-fork", 0, 0, G_OPTION_ARG_NONE, &no_fork, "Don't fork individual tests", NULL}, + {NULL} +}; + +int +main(int argc, char** argv) +{ + GOptionContext* context; + SRunner* r; + int failed = 0; + + context = g_option_context_new (""); + g_option_context_add_main_entries (context, entries, NULL); // FIXME: use the domain from libccc + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_parse (context, &argc, &argv, NULL); // FIXME: check GError + g_option_context_free (context); + context = NULL; + + r = srunner_create (suite_camera ()); + srunner_add_suite (r, suite_cell_renderer ()); + srunner_add_suite (r, suite_circle ()); + srunner_add_suite (r, suite_item ()); + srunner_add_suite (r, suite_item_view ()); + srunner_add_suite (r, suite_line ()); + srunner_add_suite (r, suite_item ()); + srunner_add_suite (r, suite_printer ()); + srunner_add_suite (r, suite_text_item ()); + srunner_add_suite (r, suite_unit ()); + srunner_add_suite (r, suite_view ()); + srunner_add_suite (r, suite_view_png ()); + srunner_add_suite (r, suite_view_widget ()); + srunner_set_fork_status(r, /*no_fork ?*/ CK_NOFORK /*: CK_FORK*/); + srunner_run_all(r, CK_NORMAL); + failed = srunner_ntests_failed(r); + srunner_free(r); + + return failed != 0; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/m-dummy.c /tmp/irThAZDHWn/libccc-0.0.5/test/m-dummy.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/m-dummy.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/m-dummy.c 2007-04-23 23:49:58.000000000 +0100 @@ -0,0 +1,38 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 + +int +main(int argc, char** argv) +{ + GOptionContext* context = g_option_context_new (""); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_parse (context, &argc, &argv, NULL); + g_option_context_free (context); + //g_warning ("Sliff"); + return 0; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/m-mock.c /tmp/irThAZDHWn/libccc-0.0.5/test/m-mock.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/m-mock.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/m-mock.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,46 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-mock-view.h" +#include "s-mock-logger.h" + +#include + +int +main(int argc, char** argv) +{ + SRunner* r; + + gtk_init (&argc, &argv); + + r = srunner_create (suite_mock_logger ()); + srunner_add_suite (r, suite_mock_view ()); + // FIXME: unexpected behavior if not set + srunner_set_fork_status(r, CK_NOFORK); + srunner_run_all (r, CK_NORMAL); + srunner_free (r); + return 0; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/mock-logger.c /tmp/irThAZDHWn/libccc-0.0.5/test/mock-logger.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/mock-logger.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/mock-logger.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,69 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "mock-logger.h" + +struct _MockLoggerPrivate { + gpointer unused; +}; + +G_DEFINE_TYPE (MockLogger, mock_logger, G_TYPE_OBJECT); + +static void +mock_logger_init (MockLogger* self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MOCK_TYPE_LOGGER, MockLoggerPrivate); +} + +static void +mock_logger_class_init (MockLoggerClass* self_class) +{ + g_type_class_add_private (self_class, sizeof (MockLoggerPrivate)); +} + +MockLogger* +mock_logger_new (gchar const* domain) +{ + return g_object_new (MOCK_TYPE_LOGGER, NULL); +} + +gchar const* +mock_logger_get_domain (MockLogger const* self) +{ + return NULL; +} + +void +mock_logger_log_fail (gchar const* domain, + GLogLevelFlags log_level, + gchar const* message, + gpointer user_data) +{ + gboolean* passed = user_data; + + /* this handler is not supposed to be called */ + *passed = FALSE; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/mock-logger.h /tmp/irThAZDHWn/libccc-0.0.5/test/mock-logger.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/mock-logger.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/mock-logger.h 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,64 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef MOCK_LOGGER_H +#define MOCK_LOGGER_H + +#include + +G_BEGIN_DECLS + +typedef struct _MockLogger MockLogger; +typedef struct _MockLoggerClass MockLoggerClass; +typedef struct _MockLoggerPrivate MockLoggerPrivate; + +#define MOCK_TYPE_LOGGER (mock_logger_get_type ()) +#define MOCK_LOGGER(i) (G_TYPE_CHECK_INSTANCE_CAST ((i), MOCK_TYPE_LOGGER, Mocklogger)) +#define MOCK_LOGGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), MOCK_TYPE_LOGGER, MockLoggerClass)) +#define MOCK_IS_LOGGER(i) (G_TYPE_CHECK_INSTANCE_TYPE ((i), MOCK_TYPE_LOGGER)) +#define MOCK_IS_LOGGER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), MOCK_TYPE_LOGGER)) +#define MOCK_LOGGER_GET_CLASS(i) (G_TYPE_INSTANCE_GET_CLASS ((i), MOCK_TYPE_LOGGER, MockLoggerClass)) + +GType mock_logger_get_type (void); +MockLogger* mock_logger_new (gchar const * domain); +gchar const* mock_logger_get_domain (MockLogger const* self); + +void mock_logger_log_fail (gchar const * domain, + GLogLevelFlags log_level, + gchar const * message, + gpointer user_data); + +struct _MockLogger { + GObject base_instance; + MockLoggerPrivate* priv; +}; + +struct _MockLoggerClass { + GObjectClass base_class; +}; + +G_BEGIN_DECLS + +#endif /* !MOCK_LOGGER_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-camera.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-camera.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-camera.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-camera.c 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,36 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-camera.h" + +#include + +Suite* +suite_camera (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_CAMERA)); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-camera.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-camera.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-camera.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-camera.h 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,33 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_CAMERA_H +#define S_CAMERA_H + +#include + +Suite* suite_camera (void); + +#endif /* !S_CAMERA_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-cell-renderer.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-cell-renderer.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-cell-renderer.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-cell-renderer.c 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,36 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-cell-renderer.h" + +#include + +Suite* +suite_cell_renderer (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_VIEW_CELL_RENDERER)); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-cell-renderer.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-cell-renderer.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-cell-renderer.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-cell-renderer.h 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,33 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_CELL_RENDERER_H +#define S_CELL_RENDERER_H + +#include + +Suite* suite_cell_renderer (void); + +#endif /* !S_CELL_RENDERER_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-circle.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-circle.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-circle.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-circle.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,37 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-circle.h" + +#include + +Suite* +suite_circle (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_CIRCLE)); + suite_add_tcase (self, tcase_circle_391646 ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-circle.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-circle.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-circle.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-circle.h 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_CIRCLE_H +#define S_CIRCLE_H + +#include + +Suite* suite_circle (void); +TCase* tcase_circle_391646 (void); + +#endif /* !S_CIRCLE_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-item.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-item.c 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,43 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include + +Suite* +suite_item (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_ITEM)); + suite_add_tcase (self, tcase_item_bounds_updates ()); + suite_add_tcase (self, tcase_item_crossing ()); + suite_add_tcase (self, tcase_item_dirty ()); + suite_add_tcase (self, tcase_item_distance ()); + suite_add_tcase (self, tcase_item_parent ()); + suite_add_tcase (self, tcase_item_view_signals ()); + suite_add_tcase (self, tcase_item_view_data ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-item.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-item.h 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,40 @@ +/* This file is part of CCC + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_ITEM_H +#define S_ITEM_H + +#include + +Suite* suite_item (void); +TCase* tcase_item_bounds_updates (void); +TCase* tcase_item_crossing (void); +TCase* tcase_item_dirty (void); +TCase* tcase_item_distance (void); +TCase* tcase_item_parent (void); +TCase* tcase_item_view_data (void); +TCase* tcase_item_view_signals (void); + +#endif /* !S_ITEM_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item-view.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-item-view.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item-view.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-item-view.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,39 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item-view.h" + +#include + +Suite* +suite_item_view (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_ITEM_VIEW)); + suite_add_tcase (self, tcase_item_view_added ()); + /* FIXME: test removed */ + /* FIXME: test reorder */ + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item-view.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-item-view.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-item-view.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-item-view.h 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_ITEM_VIEW_H +#define S_ITEM_VIEW_H + +#include + +Suite* suite_item_view (void); +TCase* tcase_item_view_added (void); + +#endif /* !S_ITEM_VIEW_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-line.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-line.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-line.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-line.c 2007-04-23 23:49:58.000000000 +0100 @@ -0,0 +1,37 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-line.h" + +#include + +Suite* +suite_line (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_LINE)); + suite_add_tcase (self, tcase_line_all_bounds ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-line.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-line.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-line.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-line.h 2007-04-23 23:49:59.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_LINE_H +#define S_LINE_H + +#include + +Suite* suite_line (void); +TCase* tcase_line_all_bounds (void); + +#endif /* !S_LINE_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-logger.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-logger.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-logger.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-logger.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,38 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-mock-logger.h" + +#include "mock-logger.h" + +Suite* +suite_mock_logger (void) +{ + Suite* self = suite_create (g_type_name (MOCK_TYPE_LOGGER)); + suite_add_tcase (self, tcase_mock_logger_init ()); + suite_add_tcase (self, tcase_mock_logger_properties ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-logger.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-logger.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-logger.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-logger.h 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,35 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_MOCK_LOGGER_H +#define S_MOCK_LOGGER_H + +#include + +Suite* suite_mock_logger (void); +TCase* tcase_mock_logger_init (void); +TCase* tcase_mock_logger_properties (void); + +#endif /* !S_MOCK_LOGGER_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-view.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-view.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-view.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-view.c 2007-04-23 23:03:33.000000000 +0100 @@ -0,0 +1,37 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-mock-view.h" + +#include "cc-test-view.h" + +Suite* +suite_mock_view (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_MOCK_VIEW)); + suite_add_tcase (self, test_mock_view_root ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-view.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-view.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-mock-view.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-mock-view.h 2007-04-23 23:03:33.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_MOCK_VIEW_H +#define S_MOCK_VIEW_H + +#include + +Suite* suite_mock_view (void); +TCase* test_mock_view_root (void); + +#endif /* !S_MOCK_VIEW_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-printer.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-printer.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-printer.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-printer.c 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,36 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-printer.h" + +#include + +Suite* +suite_printer (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_PRINTER)); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-printer.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-printer.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-printer.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-printer.h 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,33 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_PRINTER_H +#define S_PRINTER_H + +#include + +Suite* suite_printer (void); + +#endif /* !S_PRINTER_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-text.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-text.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-text.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-text.c 2007-05-05 15:00:47.000000000 +0100 @@ -0,0 +1,38 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-text.h" + +#include + +Suite* +suite_text_item(void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_TEXT)); + suite_add_tcase (self, tcase_text_dirty ()); + suite_add_tcase (self, tcase_text_utf8_editing ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-text.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-text.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-text.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-text.h 2007-05-05 15:00:47.000000000 +0100 @@ -0,0 +1,35 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef M_CCC_H +#define M_CCC_H + +#include + +Suite* suite_text_item (void); +TCase* tcase_text_dirty (void); +TCase* tcase_text_utf8_editing (void); + +#endif /* !M_CCC_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-unit.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-unit.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-unit.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-unit.c 2007-04-20 09:54:59.000000000 +0100 @@ -0,0 +1,35 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-unit.h" + +Suite* +suite_unit (void) +{ + Suite* self = suite_create ("CcUnit"); + suite_add_tcase (self, test_unit_allocation ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-unit.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-unit.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-unit.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-unit.h 2007-04-20 09:54:59.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_UNIT_H +#define S_UNIT_H + +#include + +Suite* suite_unit (void); +TCase* test_unit_allocation (void); + +#endif /* !S_UNIT_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-view.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-view.c 2007-04-23 23:03:33.000000000 +0100 @@ -0,0 +1,37 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-view.h" + +#include + +Suite* +suite_view (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_VIEW)); + suite_add_tcase (self, tcase_view_transformations ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-view.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-view.h 2007-04-23 23:03:33.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_VIEW_H +#define S_VIEW_H + +#include + +Suite* suite_view (void); +TCase* tcase_view_transformations (void); + +#endif /* !S_VIEW_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-png.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-png.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-png.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-png.c 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,36 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-view-png.h" + +#include + +Suite* +suite_view_png (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_VIEW_PNG)); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-png.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-png.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-png.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-png.h 2007-05-05 15:00:05.000000000 +0100 @@ -0,0 +1,33 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_VIEW_PNG_H +#define S_VIEW_PNG_H + +#include + +Suite* suite_view_png (void); + +#endif /* !S_VIEW_PNG_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-widget.c /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-widget.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-widget.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-widget.c 2007-05-05 15:00:25.000000000 +0100 @@ -0,0 +1,37 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-view-widget.h" + +#include + +Suite* +suite_view_widget (void) +{ + Suite* self = suite_create (g_type_name (CC_TYPE_VIEW_WIDGET)); + suite_add_tcase (self, tcase_view_widget_focus ()); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-widget.h /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-widget.h --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/s-view-widget.h 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/s-view-widget.h 2007-05-05 15:00:25.000000000 +0100 @@ -0,0 +1,34 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#ifndef S_VIEW_WIDGET_H +#define S_VIEW_WIDGET_H + +#include + +Suite* suite_view_widget (void); +TCase* tcase_view_widget_focus (void); + +#endif /* !S_VIEW_WIDGET_H */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-circle-391646.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-circle-391646.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-circle-391646.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-circle-391646.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,42 @@ +/* AUTHORS: + * Canek and Sven */ + +#include "s-circle.h" +#include +#include + +#include "cc-test-view.h" + +START_TEST(test_circle_391646) +{ + /* prepare */ + CcItem* root = cc_item_new(); + GtkWidget* view = cc_view_widget_new_root (root); + + CcColor* color = cc_color_new_rgb(0.0, 0.0, 0.0); + CcBrush* brush = cc_brush_color_new(color); + CcBrush* fill = cc_brush_color_new(cc_color_new_rgb(1.0, 1.0, 1.0)); + + CcItem* base = cc_rectangle_new(); + cc_rectangle_set_position(CC_RECTANGLE(base), 0, 0, 600, 400); + cc_shape_set_brush_border(CC_SHAPE(base), brush); + cc_shape_set_brush_content(CC_SHAPE(base), fill); + cc_item_append(root, base); + + CcItem* circle = cc_circle_new(); + cc_item_append(base, circle); + + /* check (segfault within this call) */ + cc_circle_set_radius(CC_CIRCLE(circle), 10); +} +END_TEST + +TCase* +tcase_circle_391646 (void) +{ + TCase* self = tcase_create ("Bug 391646"); + tcase_add_test (self, test_circle_391646); + return self; +} + +/* */ diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-bounds-updates.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-bounds-updates.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-bounds-updates.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-bounds-updates.c 2007-04-23 23:49:59.000000000 +0100 @@ -0,0 +1,146 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include +#include "cc-test-view.h" + +static CcView* view = NULL; +static CcItem* root = NULL; +static CcItem* child = NULL; + +static void +setup (void) +{ + view = cc_test_view_new (); + root = g_object_ref_sink (cc_item_new ()); + child = g_object_ref_sink (cc_line_new ()); +} + +static void +teardown (void) +{ + g_object_unref (child); + g_object_unref (root); + g_object_unref (view); +} + +static void +test_item_bounds_to_view_cb (CcItem * item, + CcView * view, + CcDRect * bounds, + gboolean* passed) +{ + *passed = TRUE; +} + +START_TEST(test_item_bounds_to_view) +{ + gboolean passed; + + /* prepare */ + cc_view_set_root (view, child); + cc_line_line (CC_LINE (child), 0.0, 0.0); + g_signal_connect (child, "all-bounds-changed", + G_CALLBACK (test_item_bounds_to_view_cb), &passed); + + /* check */ + passed = FALSE; + cc_line_line (CC_LINE (child), 1.0, 1.0); + fail_unless (passed); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (child, test_item_bounds_to_view_cb, &passed); +} +END_TEST + +static void +test_item_bounds_to_view_lazy_cb (CcItem * item, + CcView * view, + CcDRect * bounds, + gboolean* passed) +{ + *passed = TRUE; +} + +START_TEST(test_item_bounds_to_view_lazy) +{ + gboolean passed; + + /* prepare */ + cc_line_line (CC_LINE (child), 0.0, 0.0); + cc_line_line (CC_LINE (child), 1.0, 1.0); + g_signal_connect (child, "all-bounds-changed", + G_CALLBACK (test_item_bounds_to_view_lazy_cb), &passed); + + /* check */ + passed = FALSE; + cc_view_set_root (view, child); + fail_unless (passed); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (child, test_item_bounds_to_view_lazy_cb, &passed); +} +END_TEST + +START_TEST(test_item_bounds_recurse) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: + * + * Make sure that an update that causes a bounding box change, gets + * propagated to the parent and from that one to the view. + */ +} +END_TEST + +START_TEST(test_item_bounds_recurse_clean) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: + * + * Make sure that an update that causes a bounding box change, gets + * propagated to the parent and not to the view directly. + */ +} +END_TEST + +TCase* +tcase_item_bounds_updates (void) +{ + TCase* self = tcase_create ("Bounds Updates"); + tcase_add_checked_fixture (self, setup, teardown); + tcase_add_test (self, test_item_bounds_to_view); + tcase_add_test (self, test_item_bounds_to_view_lazy); + tcase_add_test (self, test_item_bounds_recurse); + tcase_add_test (self, test_item_bounds_recurse_clean); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-crossing.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-crossing.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-crossing.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-crossing.c 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,100 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006,2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include +#include "cc-test-view.h" + +static gint implemented = FALSE; + +START_TEST(test_item_crossing_single) +{ + CcView* view = cc_test_view_new(); + CcItem* root = cc_rectangle_new(); + cc_rectangle_set_position(CC_RECTANGLE(root), + 0.0, 0.0, 100.0, 100.0); + cc_view_set_root(view, root); +#warning "FIXME: finish" + /* emit the first motion notify (outside of root) */ + cc_test_view_motion_notify (CC_TEST_VIEW (view), -50.0, 50.0); + // - make sure the item is not picked + /* emit the second motion notify (inside of root) */ + cc_test_view_motion_notify (CC_TEST_VIEW (view), -50.0, 50.0); + // - make sure the item is picked + /* emit the third motion notify (outside of root) */ + cc_test_view_motion_notify (CC_TEST_VIEW (view), 150.0, 50.0); + // - make sure the item is not picked + g_object_unref(view); + fail_unless(implemented); +} +END_TEST + +START_TEST(test_item_crossing_into) +{ + // - emit the first motion notify (outside of root) + // - emit the second motion notify (inside of root, outside of child) + // - emit the third motion notify (inside of root, inside of child) + fail_unless(implemented); +} +END_TEST + +START_TEST(test_item_crossing_into_jumping) +{ + // - emit the first motion notify (outside of both) + // - emit the second motion notify (inside of root, inside of child) + fail_unless(implemented); +} +END_TEST + +START_TEST(test_item_crossing_out) +{ + // - emit the first motion notify (inside of root, inside of child) + // - emit the second motion notify (inside of root, outside of child) + // - emit the third motion notify (outside of root) + fail_unless(implemented); +} +END_TEST + +START_TEST(test_item_crossing_out_jumping) +{ + // - emit the first motion notify (inside of root, inside of child) + // - emit the second motion notify (outside of root) + fail_unless(implemented); +} +END_TEST + +TCase* +tcase_item_crossing (void) +{ + TCase* self = tcase_create("Crossing Events"); + tcase_add_test(self, test_item_crossing_single); + tcase_add_test(self, test_item_crossing_into); + tcase_add_test(self, test_item_crossing_into_jumping); + tcase_add_test(self, test_item_crossing_out); + tcase_add_test(self, test_item_crossing_out_jumping); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-dirty.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-dirty.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-dirty.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-dirty.c 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,234 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include +#include +#include "cc-test-view.h" + +static GtkWidget* window = NULL; +static CcView* view = NULL; +static CcItem* root = NULL; +static CcItem* line = NULL; + +static gboolean dirty_sent = FALSE; + +static gboolean implemented = FALSE; + +static void +debug_dirty (CcItem * item, + CcView * view, + CcDRect* dirty) +{ + g_print ("<< dirty sent (%s, %s) >>\n", + G_OBJECT_TYPE_NAME (item), + G_OBJECT_TYPE_NAME (view)); +} + +static void +pass_dirty (CcItem * item, + CcView * view, + CcDRect* dirty) +{ + debug_dirty (item, view, dirty); + dirty_sent = TRUE; +} + +static void +setup (void) +{ + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + view = g_object_ref_sink (cc_view_widget_new ()); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (view)); + gtk_widget_show_all (window); + while (gtk_events_pending ()) { + gtk_main_iteration (); + } + root = g_object_ref_sink (cc_item_new ()); + line = g_object_ref_sink (cc_line_new ()); + cc_line_move (CC_LINE (line), 0.0, 0.0); + cc_shape_set_brush_border (CC_SHAPE (line), + cc_brush_color_new (cc_color_new_rgb (0.0, 0.0, 1.0))); + dirty_sent = FALSE; +} + +static void +teardown (void) +{ + gtk_widget_destroy (window); + g_object_unref (view); + view = NULL; + g_object_unref (root); + root = NULL; + g_object_unref (line); + line = NULL; +} + +static void +set_dirty_sent (CcItem * item, + CcView * view, + CcDRect * dirty, + gboolean* dirty_sent) +{ + *dirty_sent = TRUE; +} + +START_TEST(test_dirty_simple) +{ + /* prepare */ + gboolean dirty_sent = FALSE; + g_signal_connect (line, "dirty", + G_CALLBACK (set_dirty_sent), &dirty_sent); + + /* check */ + cc_view_set_root (view, line); + fail_unless (dirty_sent); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (line, set_dirty_sent, &dirty_sent); +} +END_TEST + +START_TEST(test_dirty_lazy) +{ + /* prepare */ + gboolean dirty_sent = FALSE; + g_signal_connect (line, "dirty", + G_CALLBACK (set_dirty_sent), &dirty_sent); + cc_view_set_root (view, line); + + /* check */ + cc_line_line (CC_LINE (line), 1.0, 1.0); + fail_unless (dirty_sent); + + /* cleanup */ + /* FIXME: implement: + * + * view.root = line + * change line.bounds + * + * And make sure the dirty signal gets emitted while changing the bounds + */ +} +END_TEST + +START_TEST(test_dirty_recurse) +{ + /* prepare */ + g_signal_connect (line, "dirty", + G_CALLBACK (debug_dirty), NULL); + g_signal_connect (root, "dirty", + G_CALLBACK (pass_dirty), NULL); + cc_line_line (CC_LINE (line), 1.0, 1.0); + cc_item_append (root, line); + + /* check */ + cc_view_set_root (view, root); + fail_unless (dirty_sent); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (line, debug_dirty, NULL); + g_signal_handlers_disconnect_by_func (root, debug_dirty, NULL); +} +END_TEST + +START_TEST(test_dirty_recurse_implied) +{ + /* prepare */ + g_signal_connect (root, "dirty", + G_CALLBACK (pass_dirty), NULL); + cc_view_set_root (view, root); + cc_line_line (CC_LINE (line), 1.0, 1.0); + + /* check */ + cc_item_append (root, line); + while (gtk_events_pending ()) { + gtk_main_iteration (); + } + fail_unless (dirty_sent); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (root, debug_dirty, NULL); +} +END_TEST + +static void +test_dirty_recurse_lazy_cb (CcItem * item, + CcView * view, + CcDRect * dirty, + gboolean* dirty_sent) +{ + *dirty_sent = TRUE; +} + +START_TEST(test_dirty_recurse_lazy) +{ + // FIXME: also check that line doesn't emit anything to view + /* prepare */ + gboolean dirty_sent = FALSE; + cc_item_append (root, line); + cc_view_set_root (view, root); + g_signal_connect (root, "dirty", + G_CALLBACK (test_dirty_recurse_lazy_cb), &dirty_sent); + + /* check */ + cc_line_line (CC_LINE (line), 1.0, 1.0); + fail_unless (dirty_sent); + + /* cleanup */ +} +END_TEST + +START_TEST(test_no_direct_emission) +{ + /* FIXME: implement this: + * + * item.append(line) + * view.root = line + * + * And make sure that "dirty" doesn't get emitted from line with the + * view parameter. + */ + // FIXME: implement this with all the other recurse tests + fail_unless (implemented); +} +END_TEST + +TCase* +tcase_item_dirty (void) +{ + TCase* self = tcase_create ("Dirty Emission"); + tcase_add_checked_fixture (self, setup, teardown); + tcase_add_test (self, test_dirty_simple); + tcase_add_test (self, test_dirty_lazy); + tcase_add_test (self, test_dirty_recurse); + tcase_add_test (self, test_dirty_recurse_implied); + tcase_add_test (self, test_dirty_recurse_lazy); + tcase_add_test (self, test_no_direct_emission); + // FIXME: add tests for dirty emission on unregister() + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-distance.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-distance.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-distance.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-distance.c 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,126 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include "cc-test-view.h" +#include + +START_TEST(test_item_distance_empty) +{ + /* we want to get the maximum distance if the item doesn't have a + * bounding box */ + CcItem* root = cc_item_new(); + CcItem* hit = NULL; + gdouble distance; +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 0.0, 0.0, &hit); + fail_unless(distance == G_MAXDOUBLE); + fail_if(CC_IS_ITEM(hit)); +} +END_TEST + +START_TEST(test_item_distance_self) +{ + // we want to get a points that's definitely inside of an item + CcItem* root = cc_rectangle_new(); + CcItem* hit = NULL; + gdouble distance; + cc_rectangle_set_position(CC_RECTANGLE(root), + 0.0, 0.0, + 100.0, 100.0); +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 200.0, 0.0, &hit); + fail_unless(distance > 0.0); + fail_if(CC_IS_ITEM(hit)); +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 50.0, 50.0, &hit); + fail_if(distance > 0.0); + fail_unless(CC_IS_ITEM(hit) && hit == root); +} +END_TEST + +START_TEST(test_item_distance_children) +{ + CcItem* root = cc_rectangle_new(); + CcItem* child = cc_rectangle_new(); + CcItem* hit = NULL; + gdouble distance; + cc_rectangle_set_position(CC_RECTANGLE(root), + 0.0, 0.0, + 100.0, 100.0); + cc_rectangle_set_position(CC_RECTANGLE(child), + 0.0, 0.0, + 100.0, 100.0); + cc_item_append(root, child); +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 200.0, 0.0, &hit); + fail_unless(distance > 0.0); + fail_if(hit); +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 50.0, 50.0, &hit); + fail_if(distance > 0.0); + fail_unless(CC_IS_ITEM(hit) && hit == child); +} +END_TEST + +START_TEST(test_item_distance_order) +{ + gdouble distance; + CcItem* root = cc_item_new(); + CcItem* child1 = cc_rectangle_new(); + CcItem* child2 = cc_rectangle_new(); + CcItem* hit = NULL; + cc_rectangle_set_position(CC_RECTANGLE(child1), + 0.0, 0.0, + 100.0, 100.0); + cc_rectangle_set_position(CC_RECTANGLE(child2), + 0.0, 0.0, + 100.0, 100.0); + cc_item_append(root, child1); + cc_item_append(root, child2); +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 200.0, 0.0, &hit); + fail_unless(distance > 0.0); + fail_if(CC_IS_ITEM(hit)); +#warning "FIXME: we need a view" + distance = cc_item_distance(root, NULL, 50.0, 50.0, &hit); + fail_if(distance > 0.0); + fail_unless(CC_IS_ITEM(hit) && hit == child2); +} +END_TEST + +TCase* +tcase_item_distance (void) +{ +#warning "FIXME: iterate through the types" + TCase* self = tcase_create("Distance Function"); + tcase_add_test(self, test_item_distance_empty); + tcase_add_test(self, test_item_distance_self); + tcase_add_test(self, test_item_distance_children); + tcase_add_test(self, test_item_distance_order); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-parent.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-parent.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-parent.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-parent.c 2007-04-23 23:03:33.000000000 +0100 @@ -0,0 +1,76 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include + +START_TEST(test_item_parent_set) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that the parent gets set correctly */ +} +END_TEST + +START_TEST(test_item_parent_unset) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that the parent gets unset correctly */ +} +END_TEST + +START_TEST(test_item_parent_reparent_warn) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that we get a warning if the parent is already set */ +} +END_TEST + +START_TEST(test_item_parent_reparent) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that reparenting works exactly as expected */ +} +END_TEST + +TCase* +tcase_item_parent (void) +{ + TCase* self = tcase_create ("Parent Relationship"); + tcase_add_test (self, test_item_parent_set); + tcase_add_test (self, test_item_parent_unset); + tcase_add_test (self, test_item_parent_reparent_warn); + tcase_add_test (self, test_item_parent_reparent); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-view-added.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-view-added.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-view-added.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-view-added.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,123 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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. + */ + +#define G_LOG_DOMAIN "TestCcc" + +#include "s-item-view.h" + +#include +#include "mock-logger.h" + +/* snip: CcItemViewImpl */ +typedef GObject CcItemViewImpl; +typedef GObjectClass CcItemViewImplClass; + +GType cc_item_view_impl_get_type (void); + +static void cc_item_view_impl (CcItemViewIface* iface); +G_DEFINE_TYPE_WITH_CODE (CcItemViewImpl, cc_item_view_impl, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (CC_TYPE_ITEM_VIEW, cc_item_view_impl)); + +static void +cc_item_view_impl_init (CcItemViewImpl* self) {} + +static void +cc_item_view_impl_class_init (CcItemViewImplClass* self_class) {} + +static void +item_view_impl_item_added (CcItemView* self, + CcItem * parent, + gint position, + CcItem * child) +{ + g_message ("item_added (%p, %p, %d, %p)", + self, parent, position, child); +} + +static void +cc_item_view_impl (CcItemViewIface* iface) +{ + iface->item_added = item_view_impl_item_added; +} +/* snap: CcItemViewImpl */ + +static GLogFunc log_func = NULL; + +START_TEST(test_clean_implementation) +{ + /* prepare */ + gboolean passed; + log_func = g_log_set_default_handler (mock_logger_log_fail, &passed); + + /* check */ + passed = TRUE; + cc_item_view_impl_get_type (); + fail_unless (passed); + + /* cleanup */ + g_log_set_default_handler (log_func, NULL); +} +END_TEST + +START_TEST(test_no_children) +{ + /* prepare */ + gboolean implemented = FALSE; + + /* check */ + fail_unless (implemented); + + /* cleanup */ + /* FIXME */ +} +END_TEST + +START_TEST(test_one_level) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + /* FIXME */ +} +END_TEST + +START_TEST(test_no_recurse) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + /* FIXME */ +} +END_TEST + +TCase* +tcase_item_view_added (void) +{ + TCase* self = tcase_create ("CcViewWidget::item_added"); + tcase_add_test (self, test_clean_implementation); + tcase_add_test (self, test_no_children); + tcase_add_test (self, test_one_level); + tcase_add_test (self, test_no_recurse); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-view-data.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-view-data.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-view-data.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-view-data.c 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,81 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include +#include +#include +#include + +static CcItemClass* item_class = NULL; +static CcItemClass* text_class = NULL; + +static void +setup (void) +{ + item_class = g_type_class_ref (CC_TYPE_ITEM); + text_class = g_type_class_ref (CC_TYPE_TEXT); +} + +static void +teardown (void) +{ + g_type_class_unref (item_class); + item_class = NULL; + g_type_class_unref (text_class); + text_class = NULL; +} + +START_TEST(test_initial_size) +{ + fail_unless (item_class->view_data_size != 0); + fail_unless (text_class->view_data_size != 0); +} +END_TEST + +START_TEST(test_camera) +{ + CcItem* item = g_object_ref_sink (cc_item_new ()); + CcItem* demo = cc_text_new ("Sliff Sloff Slubb"); + CcItem* camera = cc_camera_new_root (demo); + cc_item_append (item, demo); + cc_item_append (item, camera); + g_object_unref (item); +} +END_TEST + +// FIXME: test_mem_alignment + +TCase* +tcase_item_view_data (void) +{ + TCase* self = tcase_create ("view-related data"); + tcase_add_checked_fixture (self, setup, teardown); + tcase_add_test (self, test_initial_size); + tcase_add_test (self, test_camera); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-view-signals.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-view-signals.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-item-view-signals.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-item-view-signals.c 2007-05-05 21:13:25.000000000 +0100 @@ -0,0 +1,262 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-item.h" + +#include +#include +#include + +#include "callgrind-helpers.h" +#include "cc-test-view.h" + +static CcView* view = NULL; +static CcItem* item = NULL; +static CcItem* child = NULL; + +static void +setup (void) +{ + view = cc_test_view_new (); + item = cc_item_new (); + g_object_ref_sink (item); + child = cc_item_new (); + g_object_ref_sink (child); +} + +static void +teardown (void) +{ + g_object_unref (view); + view = NULL; + g_object_unref (item); + item = NULL; + g_object_unref (child); + child = NULL; +} + +static void +item_view_register (CcItem * item, + CcView * view, + gboolean* registered) +{ + if (G_OBJECT_TYPE (view) == CC_TYPE_TEST_VIEW) { + *registered = TRUE; + } +} + +START_TEST(test_register_plain) +{ + /* prepare */ + gboolean registered; + g_signal_connect (item, "view-register", + G_CALLBACK (item_view_register), ®istered); + + /* check */ + registered = FALSE; + + CALLGRIND_START_INSTRUMENTATION; + CALLGRIND_ZERO_STATS; + cc_view_set_root (view, item); + CALLGRIND_DUMP_STATS_AT("test_plain_register"); + CALLGRIND_STOP_INSTRUMENTATION; + + fail_unless (registered); + + /* cleanup */ +} +END_TEST + +START_TEST(test_register_recurse) +{ + gboolean registered; + + cc_item_append (item, child); + g_signal_connect (child, "view-register", + G_CALLBACK (item_view_register), ®istered); + registered = FALSE; + cc_view_set_root (view, item); + fail_unless (registered); +} +END_TEST + +#ifdef ENABLE_IMPOSSIBLE +static void +item_view_register_order (CcItem * item, + CcView * view, + gboolean* passed) +{ + enum { + ORDER_START, /* initial state */ + ORDER_VIEW, /* registered with the test view but not with the item */ + ORDER_ITEM, /* registered with the item and the test view */ + ORDER_DONE = ORDER_ITEM + }; + static gint state = ORDER_START; + + if (state == ORDER_START && g_type_is_a (G_OBJECT_TYPE (view), CC_TYPE_TEST_VIEW)) { + state = ORDER_VIEW; + } else if (state == ORDER_VIEW && g_type_is_a (G_OBJECT_TYPE (view), CC_TYPE_ITEM)) { + state = ORDER_ITEM; + } else { + gchar const* states[] = { + "start", "view", "item" + }; + g_warning ("Error while checking view register order\nstate: %s\nview: %s", + states[state], G_OBJECT_TYPE_NAME (view)); + } + + if (state == ORDER_DONE) { + *passed = TRUE; + } +} + +START_TEST(test_register_order) +{ + gboolean passed = FALSE; + + cc_view_set_root (view, item); + g_signal_connect (child, "view-register", + G_CALLBACK (item_view_register_order), &passed); + cc_item_append (item, child); + + fail_unless (passed); +} +END_TEST +#endif + +START_TEST(test_register_lazy) +{ + gboolean registered; + + cc_view_set_root (view, item); + g_signal_connect (child, "view-register", + G_CALLBACK (item_view_register), ®istered); + registered = FALSE; + cc_item_append (item, child); + fail_unless (registered); +} +END_TEST + +// TODO: item_append(item, child) => set_root(view, child) => no signal on item + +static void +item_view_unregister (CcItem * item, + CcView * view, + gboolean* unregistered) +{ + if (G_OBJECT_TYPE (view) == CC_TYPE_TEST_VIEW) { + *unregistered = TRUE; + } +} + +START_TEST(test_unregister_plain) +{ + gboolean unregistered; + cc_view_set_root (view, item); + g_signal_connect (item, "view-unregister", + G_CALLBACK (item_view_unregister), &unregistered); + unregistered = FALSE; + cc_view_set_root (view, NULL); + fail_unless (unregistered); +} +END_TEST + +START_TEST(test_unregister_recurse) +{ + gboolean unregistered; + + cc_item_append (item, child); + cc_view_set_root (view, item); + g_signal_connect (child, "view-unregister", + G_CALLBACK (item_view_unregister), &unregistered); + unregistered = FALSE; + cc_view_set_root (view, NULL); + fail_unless (unregistered); +} +END_TEST + +#ifdef ENABLE_IMPOSSIBLE +START_TEST(test_unregister_order) +{ + gboolean passed = FALSE; + + fail_unless (passed); +} +END_TEST +#endif + +START_TEST(test_unregister_lazy) +{ + gboolean unregistered; + + cc_item_append (item, child); + cc_view_set_root (view, item); + g_signal_connect (child, "view-unregister", + G_CALLBACK (item_view_unregister), &unregistered); + unregistered = FALSE; + cc_item_remove (item, child); + fail_unless (unregistered); +} +END_TEST + +#include + +START_TEST(test_camera) +{ + CcItem* canvas = cc_item_new (); + CcItem* demo = cc_text_new ("Sliff Sloff Slubb"); + CcItem* camera = cc_camera_new_root (demo); + CcItem* handle = cc_circle_new (); + cc_view_set_zoom (CC_VIEW(camera), 0.25); + cc_circle_set_radius (CC_CIRCLE (handle), 5.0); + cc_circle_set_anchor (CC_CIRCLE (handle), 100.0, 100.0); + cc_shape_set_brush_content (CC_SHAPE (handle), cc_brush_color_new (cc_color_new_rgb (0.64, 0.0, 0.0))); + cc_item_append (canvas, demo); + cc_item_append (canvas, camera); + cc_item_append (canvas, handle); + cc_view_set_root (view, canvas); +} +END_TEST + +TCase* +tcase_item_view_signals (void) +{ + TCase* self = tcase_create ("View Signals"); + tcase_add_checked_fixture (self, setup, teardown); + tcase_add_test (self, test_register_plain); + tcase_add_test (self, test_unregister_plain); + tcase_add_test (self, test_register_recurse); + tcase_add_test (self, test_unregister_recurse); +#ifdef ENABLE_IMPOSSIBLE + tcase_add_test (self, test_register_order); + tcase_add_test (self, test_unregister_order); +#endif + tcase_add_test (self, test_register_lazy); + tcase_add_test (self, test_unregister_lazy); + tcase_add_test (self, test_camera); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-line-all-bounds.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-line-all-bounds.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-line-all-bounds.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-line-all-bounds.c 2007-04-23 23:49:59.000000000 +0100 @@ -0,0 +1,86 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-line.h" + +#include + +START_TEST(test_line_bounds_none) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that a newly created CcLine doesn't have a bounding box */ +} +END_TEST + +START_TEST(test_line_bounds_single_line) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that adding a signle point creates the bounding box */ +} +END_TEST + +START_TEST(test_line_bounds_single_move) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that adding a signle point creates the bounding box */ +} +END_TEST + +START_TEST(test_line_bounds_multiple_points) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that the bounding box is correct when adding multiple points */ +} +END_TEST + +START_TEST(test_line_bounds_multiple_moves) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: make sure that multiple moves don't change the bounding box */ +} +END_TEST + +TCase* +tcase_line_all_bounds (void) +{ + TCase* self = tcase_create ("All-Bounds Handling"); + tcase_add_test (self, test_line_bounds_none); + tcase_add_test (self, test_line_bounds_single_line); + tcase_add_test (self, test_line_bounds_single_move); + tcase_add_test (self, test_line_bounds_multiple_points); + tcase_add_test (self, test_line_bounds_multiple_moves); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-mock-logger-init.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-mock-logger-init.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-mock-logger-init.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-mock-logger-init.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,50 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-mock-logger.h" + +#include "mock-logger.h" + +START_TEST(test_logger_new) +{ + /* prepare */ + MockLogger* logger = mock_logger_new ("SomeDomain"); + + /* check */ + fail_unless (logger != NULL); + + /* cleanup */ + g_object_unref (logger); +} +END_TEST + +TCase* +tcase_mock_logger_init (void) +{ + TCase* self = tcase_create ("initialization"); + tcase_add_test (self, test_logger_new); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-mock-logger-properties.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-mock-logger-properties.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-mock-logger-properties.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-mock-logger-properties.c 2007-05-05 14:59:46.000000000 +0100 @@ -0,0 +1,73 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-mock-logger.h" + +#include +#include "mock-logger.h" + +static gchar const* domains[] = { + "SomeDomain", + "OtherDomain" +}; + +START_TEST(test_construct_domain) +{ + /* prepare */ + gchar const* checked; + MockLogger* logger = mock_logger_new (domains[_i]); + + /* check */ + checked = mock_logger_get_domain (logger); + fail_unless (checked && !strcmp (domains[_i], checked)); + + /* cleanup */ +} +END_TEST + +START_TEST(test_construct_domain_g) +{ + /* prepare */ + gchar const* checked; + MockLogger* logger = mock_logger_new (domains[_i]); + + /* check */ + checked = mock_logger_get_domain (logger); + fail_unless (checked && !strcmp (domains[_i], checked)); + + /* cleanup */ +} +END_TEST + +TCase* +tcase_mock_logger_properties (void) +{ + TCase* self = tcase_create ("properties"); + // FIXME: write general property testing code + tcase_add_loop_test (self, test_construct_domain, 0, G_N_ELEMENTS (domains)); + tcase_add_loop_test (self, test_construct_domain_g, 0, G_N_ELEMENTS (domains)); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-mock-view-root.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-mock-view-root.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-mock-view-root.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-mock-view-root.c 2007-04-23 23:03:34.000000000 +0100 @@ -0,0 +1,80 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-mock-view.h" + +#include "cc-test-view.h" + +START_TEST(test_set_root) +{ + CcItem* item; + CcView* view; + + item = cc_item_new (); + view = cc_test_view_new (); + cc_view_set_root (view, item); + + fail_unless (item == cc_view_get_root (view)); + + cc_view_set_root (view, NULL); + fail_unless (NULL == cc_view_get_root (view)); +} +END_TEST + +static void +item_view_register (CcItem * item, + CcView * view, + gboolean* registered) +{ + *registered = TRUE; +} + +START_TEST(test_view_register) +{ + CcItem* item; + CcView* view; + + gboolean registered; + + item = cc_item_new (); + view = cc_test_view_new (); + + g_signal_connect (item, "view-register", + G_CALLBACK (item_view_register), ®istered); + registered = FALSE; + cc_view_set_root (view, item); + fail_unless (registered); +} +END_TEST + +TCase* +test_mock_view_root (void) +{ + TCase* self = tcase_create ("Root Item handling"); + tcase_add_test (self, test_set_root); + tcase_add_test (self, test_view_register); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-text-dirty.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-text-dirty.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-text-dirty.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-text-dirty.c 2007-05-05 15:00:47.000000000 +0100 @@ -0,0 +1,183 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-text.h" + +#include +#include "cc-test-view.h" + +static CcView* view = NULL; +static CcItem* item = NULL; + +static void +setup (void) +{ + view = cc_test_view_new (); + item = g_object_ref_sink (cc_text_new ("")); + cc_view_set_root (view, item); +} + +static void +teardown (void) +{ + g_object_unref (view); + view = NULL; + g_object_unref (item); + item = NULL; +} + +static void +test_dirty_emission_cb (CcItem * item, + CcView * view, + CcDRect const* dirty, + gboolean * passed) +{ + *passed = TRUE; +} + +START_TEST(test_dirty_emission) +{ + /* prepare */ + gboolean passed; + gchar * text = g_strdup_printf ("%d", _i); + + g_signal_connect (item, "dirty", + G_CALLBACK (test_dirty_emission_cb), &passed); + + /* check */ + passed = FALSE; + cc_text_set_text (CC_TEXT (item), text); + fail_unless (passed); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (item, test_dirty_emission_cb, &passed); + g_free (text); +} +END_TEST + +static void +test_dirty_bounds_cb (CcItem * item, + CcView * view, + CcDRect const* dirty, + gboolean * passed) +{ + CcDRect const* bbox = cc_item_get_all_bounds (item, view); + + if (!CC_IS_VIEW (view)) { + // FIXME: get rid of this check + return; + } + +#if 1 + // FIXME: use the other check + *passed = bbox != NULL; +#else + *passed &= bbox != NULL; +#endif +} + +START_TEST(test_dirty_bounds) +{ + /* prepare */ + gboolean passed; + gchar * text = g_strdup_printf ("%d", _i); + + g_signal_connect (item, "dirty", + G_CALLBACK (test_dirty_bounds_cb), &passed); + + /* check */ + passed = FALSE; + cc_text_set_text (CC_TEXT (item), text); + fail_unless (passed); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (item, test_dirty_bounds_cb, &passed); + g_free (text); +} +END_TEST + +static void +test_dirty_region_cb (CcItem * item, + CcView * view, + CcDRect const* dirty, + gboolean * passed) +{ + CcDRect const* bbox = cc_item_get_all_bounds (item, view); + + g_print ("test_dirty_region_cb(%s, %s)\n", + G_OBJECT_TYPE_NAME (item), + G_OBJECT_TYPE_NAME (view)); + + if (!CC_IS_VIEW (view)) { + // FIXME: get rid of this check + return; + } + + if (!bbox) { + // FIXME: get rid of this check + return; + } + + if ((bbox->x1 > dirty->x1) || + (bbox->y1 > dirty->y1) || + (bbox->x2 < dirty->x2) || + (bbox->y2 < dirty->y2)) + { + g_print ("3:bbox:%p\n", bbox), + *passed = FALSE; + } +} + +START_TEST(test_dirty_region) +{ + /* prepare */ + gboolean passed; + gchar * text = g_strdup_printf ("%d", _i); + + g_signal_connect (item, "dirty", + G_CALLBACK (test_dirty_region_cb), &passed); + + /* check */ + passed = TRUE; + cc_text_set_text (CC_TEXT (item), text); + fail_unless (passed); + + /* cleanup */ + g_signal_handlers_disconnect_by_func (item, test_dirty_region_cb, &passed); + g_free (text); +} +END_TEST + +TCase* +tcase_text_dirty (void) +{ + TCase* self = tcase_create ("dirty region management"); + tcase_add_checked_fixture (self, setup, teardown); + tcase_add_loop_test (self, test_dirty_emission, 0, 11); + tcase_add_loop_test (self, test_dirty_bounds, 0, 11); + tcase_add_loop_test (self, test_dirty_region, 0, 11); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-text-utf8-editing.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-text-utf8-editing.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-text-utf8-editing.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-text-utf8-editing.c 2007-05-05 21:58:18.000000000 +0100 @@ -0,0 +1,146 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2006 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-text.h" + +#include +#include +#include +#include +#include + +#include "gtk-helpers.h" + +static gboolean implemented = FALSE; + +static void +check_cursor(CcText* text, gint expected_position, gint expected_trail) +{ + fail_unless(text->cursor == expected_position); + fail_unless(text->cursor_trail == expected_trail); +} + +START_TEST(test_cursor_navigation) +{ + GtkWidget* win; + CcText* text; + CcView* view; + guint i = 0; + gint positions[][2] = { + {0,0}, {1,0}, {2,0}, {4,0}, {5,0}, {5,1}, {5,1} + }; + gint positions_back[][2] = { + {5,0}, {4,0}, {2,0}, {1,0}, {0,0}, {0,0} + }; + GdkEventKey key = { + GDK_KEY_PRESS, + NULL, + TRUE, + GDK_CURRENT_TIME, + 0, + GDK_Right, + 0, + NULL, + 0, 0, + FALSE + }; + gboolean retval = FALSE; + text = CC_TEXT(cc_text_new("Zwölf")); +#warning "FIXME: use the test view" + view = CC_VIEW(cc_view_widget_new_root(CC_ITEM(text))); + win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_container_add(GTK_CONTAINER(win), GTK_WIDGET(view)); + gtk_widget_show_all(win); + gtk_main_flush(); + key.window = GTK_WIDGET(view)->window; + check_cursor(text, positions[i][0], positions[i][1]); + for(i = 1; i < G_N_ELEMENTS(positions); i++) { + g_signal_emit_by_name(text, "event", view, &key, &retval); + check_cursor(text, positions[i][0], positions[i][1]); + } + key.keyval = GDK_Left; + for(i = 0; i < G_N_ELEMENTS(positions_back); i++) { + g_signal_emit_by_name(text, "event", view, &key, &retval); + check_cursor(text, positions_back[i][0], positions_back[i][1]); + } + // move left, expect: 5,4,2,1,0, 0 + g_object_unref(text); +} +END_TEST + +START_TEST(test_utf8_backspace) +{ + GdkEventKey key = { + GDK_KEY_PRESS, + NULL, + TRUE, + GDK_CURRENT_TIME, + 0, + 0, + 0, + NULL, + 0, 0, + FALSE + }; + struct { + guint keyval; + gchar const* expected; + } iterations[] = { + {GDK_Z, "Z"}, + {GDK_w, "Zw"}, + {GDK_odiaeresis, "Zwö"}, + {GDK_BackSpace, "Zw"}, + {GDK_a, "Zwa"}, + {GDK_n, "Zwan"}, + {GDK_z, "Zwanz"}, + {GDK_i, "Zwanzi"}, + {GDK_g, "Zwanzig"} + }; + // FIXME: check cursor position + // FIXME: check multiple backspace hits + // FIXME: check backspace IN the string, not just at the end + fail_unless(implemented); +} +END_TEST + +START_TEST(test_utf8_delete) +{ + // FIXME: check cursor position + // FIXME: check mutiple delete presses + // FIXME: check both in the beginning and IN the string + fail_unless(implemented); +} +END_TEST + +TCase* +tcase_text_utf8_editing (void) +{ + TCase* self = tcase_create("UTF8 Editing"); + tcase_add_test(self, test_cursor_navigation); + tcase_add_test(self, test_utf8_delete); + tcase_add_test(self, test_utf8_backspace); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-unit-allocation.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-unit-allocation.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-unit-allocation.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-unit-allocation.c 2007-04-23 23:49:59.000000000 +0100 @@ -0,0 +1,46 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-unit.h" + +#include + +START_TEST(test_unit_simple) +{ + CcDistance* distance = cc_distance_new (5.0, CC_UNIT_DISPLAY_PIXEL); + cc_distance_free (distance); +} +END_TEST + +TCase* +test_unit_allocation (void) +{ + /* FIXME: implement a test that checks the different unit types based + * upon GType introspection */ + TCase* self = tcase_create ("Memory Management"); + tcase_add_test (self, test_unit_simple); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-view-transformations.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-view-transformations.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-view-transformations.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-view-transformations.c 2007-04-23 23:03:34.000000000 +0100 @@ -0,0 +1,79 @@ +/* This file is part of libccc + * + * AUTHORS + * Sven Herzberg + * + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-view.h" + +#include "cc-test-view.h" + +START_TEST(test_view_transformations_direct) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: + * Implement a test that makes sure that the transformation functions + * get called if implemented. + */ +} +END_TEST + +START_TEST(test_view_transformations_indirect) +{ + /* prepare */ + CcView* view = cc_test_view_new (); + // FIXME: set transformation matrix + + /* check */ + // FIXME: check transformations + gboolean implemented = FALSE; + fail_unless (implemented); + + /* cleanup */ + g_object_unref (view); +} +END_TEST + +START_TEST(test_view_transformations_priority) +{ + gboolean implemented = FALSE; + fail_unless (implemented); + + /* FIXME: + * Implement a test that makes sure that the tranformation matrix is + * the preferred API. (Implement a sample class for this test.) + */ +} +END_TEST + +TCase* +tcase_view_transformations (void) +{ + TCase* self = tcase_create ("Transformations"); + tcase_add_test (self, test_view_transformations_direct); + tcase_add_test (self, test_view_transformations_indirect); + tcase_add_test (self, test_view_transformations_priority); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-view-widget-focus.c /tmp/irThAZDHWn/libccc-0.0.5/test/t-view-widget-focus.c --- /tmp/vgIwXsgmrf/libccc-0.0.3/test/t-view-widget-focus.c 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/test/t-view-widget-focus.c 2007-05-05 15:00:25.000000000 +0100 @@ -0,0 +1,99 @@ +/* This file is part of libccc + * + * AUTHORS + * Canek Peláez Valdés + * Sven Herzberg + * + * Copyright (C) 2007 Canek Peláez Valdés + * Copyright (C) 2007 Sven Herzberg + * + * This work is provided "as is"; redistribution and modification + * in whole or in part, in any medium, physical or electronic is + * permitted without restriction. + * + * This work 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. + * + * In no event shall the authors or contributors 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 "s-view-widget.h" + +#include +#include + + +static gboolean +button_press(CcItem *self, CcView *view, GdkEventButton *event, gpointer user_data) +{ + g_print("button_press\n"); + return TRUE; +} + +static gboolean +key_press(CcItem *self, CcView *view, GdkEventKey *event, gpointer user_data) +{ + g_print("key_press\n"); + return TRUE; +} + +static gboolean +key_release(CcItem *self, CcView *view, GdkEventKey *event, gpointer user_data) +{ + g_print("key_release\n"); + return TRUE; +} + +START_TEST(test_view_widget_focus) +{ + GtkWidget* window = NULL; + gboolean implemented = FALSE; + fail_unless (implemented); + + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(window), "Key related events bug"); + gtk_window_set_default_size(GTK_WINDOW(window), 640, 480); + + g_signal_connect(window, "delete-event", G_CALLBACK(gtk_main_quit), NULL); + + CcItem* root = cc_item_new(); + GtkWidget* view = cc_view_widget_new_root(root); + + gtk_container_add(GTK_CONTAINER(window), view); + + CcItem* rect = cc_rectangle_new(); + cc_rectangle_set_position(CC_RECTANGLE(rect), 1, 1, 638, 478); + cc_shape_set_brush_border(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgb(0.0, 0.0, 0.0))); + cc_shape_set_brush_content(CC_SHAPE(rect), cc_brush_color_new(cc_color_new_rgb(1.0, 1.0, 1.0))); + + + g_signal_connect(root, "button-press-event", G_CALLBACK(button_press), NULL); + g_signal_connect(root, "key-press-event", G_CALLBACK(key_press), NULL); + g_signal_connect(root, "key-release-event", G_CALLBACK(key_release), NULL); + + cc_item_append(root, rect); + + gtk_widget_show_all(window); + + gtk_widget_grab_focus(view); + + //gtk_main(); +} +END_TEST + +TCase* +tcase_view_widget_focus (void) +{ + TCase* self = tcase_create ("focus handling"); + tcase_add_test (self, test_view_widget_focus); + return self; +} + diff -Nru /tmp/vgIwXsgmrf/libccc-0.0.3/TODO /tmp/irThAZDHWn/libccc-0.0.5/TODO --- /tmp/vgIwXsgmrf/libccc-0.0.3/TODO 2006-06-13 12:02:24.000000000 +0100 +++ /tmp/irThAZDHWn/libccc-0.0.5/TODO 2007-04-28 20:35:43.000000000 +0100 @@ -1,10 +1,28 @@ canvas: * show/hide - * focus * rename "bounds" signals - * fix the bound-caching stuff - * scroll region + * make the "path" vfunc of the CcShape a signal so people can post-process it, + fix the bounds function to use path demo: * show/hide demo - * focus into the fifteen game + +doc: + * implement a script that checks for missing get_type() functions in ccc.types + * implement a script that checks the ccc-sections.txt file + +tests: + * add a CcTestView that renders into a GdkWindow so we can safely emit events + from there + * add a test that makes sure that a new canvas gets displayed with the right + adjustments + * Add some generic tests that can be applied to all classes implementing a + certain interface + * analyse test coverage: http://check.sourceforge.net/doc/check.html/Determining-Test-Coverage.html#Determining-Test-Coverage + +checks: + * make sure that documentation/test coverage doesn't get worse when merging + a branch + * make sure the license is correct in any place (examples, lib, tests) + * make sure timeouts are saved and (if necessary) removed +