diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/ABOUT-NLS clutter-0.7.4/ABOUT-NLS --- clutter-0.7.2/ABOUT-NLS 2008-06-10 15:11:42.000000000 +0100 +++ clutter-0.7.4/ABOUT-NLS 1970-01-01 01:00:00.000000000 +0100 @@ -1,1068 +0,0 @@ -1 Notes on the Free Translation Project -*************************************** - -Free software is going international! The Free Translation Project is -a way to get maintainers of free software, translators, and users all -together, so that free software will gradually become able to speak many -languages. A few packages already provide translations for their -messages. - - If you found this `ABOUT-NLS' file inside a distribution, you may -assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do _not_ -need to install GNU `gettext' prior to configuring, installing or using -this package with messages translated. - - Installers will find here some useful hints. These notes also -explain how users should proceed for getting the programs to use the -available translations. They tell how people wanting to contribute and -work on translations can contact the appropriate team. - - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters -=================== - -Some packages are "localizable" when properly installed; the programs -they contain can be made to speak your own native language. Most such -packages use GNU `gettext'. Other packages have their own ways to -internationalization, predating GNU `gettext'. - - By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: - - ./configure --with-included-gettext - ./configure --disable-nls - -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. - - When you already have GNU `gettext' installed on your system and run -configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. - - Internationalized packages usually have many `po/LL.po' files, where -LL gives an ISO 639 two-letter code identifying the language. Unless -translations have been forbidden at `configure' time by using the -`--disable-nls' switch, all available translations are installed -together with the package. However, the environment variable `LINGUAS' -may be set, prior to configuration, to limit the installed set. -`LINGUAS' should then contain a space separated list of two-letter -codes, stating which languages are allowed. - -1.3 Using This Package -====================== - -As a user, if your language has been installed for this package, you -only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. If you happen to have the `LC_ALL' or some other -`LC_xxx' environment variables set, you should unset them before -setting `LANG', otherwise the setting of `LANG' will not have the -desired effect. Here `LL' is an ISO 639 two-letter language code, and -`CC' is an ISO 3166 two-letter country code. For example, let's -suppose that you speak German and live in Germany. At the shell -prompt, merely execute `setenv LANG de_DE' (in `csh'), -`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). -This can be done from your `.login' or `.profile' file, once and for -all. - - You might think that the country code specification is redundant. -But in fact, some languages have dialects in different countries. For -example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The -country code serves to distinguish the dialects. - - The locale naming convention of `LL_CC', with `LL' denoting the -language and `CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your language by running the -command `locale -a | grep '^LL''. - - Not all programs have translations for all languages. By default, an -English message is shown in place of a nonexistent translation. If you -understand other languages, you can set up a priority list of languages. -This is done through a different environment variable, called -`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' -for the purpose of message handling, but you still need to have `LANG' -set to the primary language; this is required by other parts of the -system libraries. For example, some Swedish users who would rather -read translations in German than English for when Swedish is not -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. - - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from `no' to `nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under `nb' and some older ones under `no', it's recommended -for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and -older translations are used. - - In the `LANGUAGE' environment variable, but not in the `LANG' -environment variable, `LL_CC' combinations can be abbreviated as `LL' -to denote the language's main dialect. For example, `de' is equivalent -to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' -(Portuguese as spoken in Portugal) in this context. - -1.4 Translating Teams -===================== - -For the Free Translation Project to be a success, we need interested -people who like their own language and write it well, and who are also -able to synergize with other translators speaking the same language. -Each translation team has its own mailing list. The up-to-date list of -teams can be found at the Free Translation Project's homepage, -`http://translationproject.org/', in the "Teams" area. - - If you'd like to volunteer to _work_ at translating messages, you -should become a member of the translating team for your own language. -The subscribing address is _not_ the same as the list itself, it has -`-request' appended. For example, speakers of Swedish can send a -message to `sv-request@li.org', having this message body: - - subscribe - - Keep in mind that team members are expected to participate -_actively_ in translations, or at solving translational difficulties, -rather than merely lurking around. If your team does not exist yet and -you want to start one, or if you are unsure about what to do or how to -get started, please write to `coordinator@translationproject.org' to -reach the coordinator for all translator teams. - - The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skills are praised more than -programming skills, here. - -1.5 Available Packages -====================== - -Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of November -2007. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a -translation percentage of at least 50%. - - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - Compendium | [] [] [] [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] [] | - bash | [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - dialog | | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - fetchmail | [] [] () [] [] | - findutils | [] | - findutils_stable | [] [] [] | - flex | [] [] [] | - fslint | | - gas | | - gawk | [] [] [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gip | [] | - gliv | [] [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | [] [] () () [] | - gnuedu | | - gnulib | [] | - gnunet | | - gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | | - gramadoir | [] [] | - grep | [] [] | - gretl | () | - gsasl | | - gss | | - gst-plugins-bad | [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gst-plugins-ugly | [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | () | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] | - indent | [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lprng | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] | - make | [] [] | - man-db | [] [] [] | - minicom | [] [] [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] | - pwdutils | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - shared-mime-info | [] [] [] [] () [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - skencil | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] | - texinfo | [] [] [] | - tin | () () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 - - es et eu fa fi fr ga gl gu he hi hr hu id is it - +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] | - bfd | [] [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - dialog | [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - fetchmail | [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] | - flex | [] [] [] | - fslint | | - gas | [] [] | - gawk | [] [] [] [] () | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] [] | - gip | [] [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnuedu | [] | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] [] | - gpsdrive | [] | - gramadoir | [] [] | - grep | [] [] [] | - gretl | [] [] [] () | - gsasl | [] [] | - gss | [] [] | - gst-plugins-bad | [] [] [] [] | - gst-plugins-base | [] [] [] [] | - gst-plugins-good | [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] [] | - latrine | [] [] | - ld | [] [] [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] [] [] | - lingoteach | [] [] [] | - lprng | | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | [] | - minicom | [] [] [] [] | - nano | [] [] [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | [] | - skencil | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - tin | [] () | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - util-linux-ng | [] [] [] [] [] [] [] | - vorbis-tools | | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 - - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - +--------------------------------------------------+ - Compendium | [] | - a2ps | () [] [] | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | [] | - cpplib | [] | - cryptonit | [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - fetchmail | [] [] | - findutils | [] | - findutils_stable | [] | - flex | [] [] | - fslint | | - gas | | - gawk | [] [] | - gcal | | - gcc | | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] [] | - gnubiff | | - gnucash | () () () | - gnuedu | | - gnulib | [] [] | - gnunet | | - gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | [] | - gpsdrive | [] | - gramadoir | () | - grep | [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins-bad | [] | - gst-plugins-base | [] | - gst-plugins-good | [] | - gst-plugins-ugly | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] | - indent | [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] | - libexif | | - libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | [] | - libidn | [] [] | - lifelines | [] | - lilypond | [] | - lingoteach | [] | - lprng | | - lynx | [] [] | - m4 | [] [] | - mailfromd | | - mailutils | | - make | [] [] [] | - man-db | | - minicom | [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] [] [] | - pwdutils | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - shared-mime-info | [] [] [] [] [] [] [] | - sharutils | [] [] | - shishi | | - skencil | | - solfege | () () | - soundtracker | | - sp | () | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] | - tin | | - tuxpaint | () [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - util-linux-ng | [] [] | - vorbis-tools | | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 - - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] [] | - bash | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - dialog | [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - fetchmail | [] [] [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] [] | - gcal | [] | - gcc | [] [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () [] | - gnucash | () [] | - gnuedu | | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] | - gramadoir | [] [] | - grep | [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] [] | - gss | [] [] [] [] | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] | - gst-plugins-ugly | [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] | - gtkam | [] [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - herrie | [] [] [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] [] | - libgpg-error | [] [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lprng | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] [] [] [] | - minicom | [] [] [] [] [] | - nano | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | [] [] | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - skencil | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] | - texinfo | [] [] [] [] | - tin | () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | - wastesedge | | - wdiff | [] [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 - - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - +---------------------------------------------------+ - Compendium | [] [] [] [] | 19 - a2ps | [] [] [] | 19 - aegis | [] | 1 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 16 - bash | [] | 6 - bfd | | 2 - bibshelf | [] | 7 - binutils | [] [] [] [] | 9 - bison | [] [] [] [] | 20 - bison-runtime | [] [] [] [] | 18 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 5 - clisp | | 9 - console-tools | [] [] | 5 - coreutils | [] [] [] | 18 - cpio | [] [] [] [] | 11 - cpplib | [] [] [] [] [] | 12 - cryptonit | [] | 6 - dialog | [] [] [] | 9 - diffutils | [] [] [] [] [] | 29 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - fetchmail | [] [] | 12 - findutils | [] [] [] | 11 - findutils_stable | [] [] [] [] | 18 - flex | [] [] | 15 - fslint | [] | 2 - gas | [] | 3 - gawk | [] [] [] | 16 - gcal | [] | 5 - gcc | [] [] [] | 7 - gettext-examples | [] [] [] [] [] [] | 29 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 20 - gip | [] [] | 13 - gliv | [] [] | 11 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 16 - gnubiff | [] | 2 - gnucash | () [] | 5 - gnuedu | [] | 2 - gnulib | [] | 10 - gnunet | | 0 - gnunet-gtk | [] [] | 3 - gnutls | | 4 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] | 7 - gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] [] | 16 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] [] | 22 - gpe-filemanager | [] [] | 7 - gpe-go | [] [] [] [] | 19 - gpe-login | [] [] [] [] [] | 21 - gpe-ownerinfo | [] [] [] [] | 21 - gpe-package | [] | 6 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] [] | 21 - gpe-taskmanager | [] [] [] [] | 21 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] [] | 8 - gphoto2 | [] [] [] [] | 21 - gprof | [] [] | 13 - gpsdrive | [] | 5 - gramadoir | [] | 7 - grep | [] | 12 - gretl | | 6 - gsasl | [] [] [] | 9 - gss | [] | 7 - gst-plugins-bad | [] [] [] | 13 - gst-plugins-base | [] [] | 11 - gst-plugins-good | [] [] [] [] [] | 16 - gst-plugins-ugly | [] [] [] | 13 - gstreamer | [] [] [] | 18 - gtick | [] [] | 7 - gtkam | [] | 16 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 27 - gutenprint | | 4 - hello | [] [] [] [] [] | 38 - herrie | [] [] | 8 - hylafax | | 0 - idutils | [] [] | 15 - indent | [] [] [] [] [] | 28 - iso_15924 | [] [] | 4 - iso_3166 | [] [] [] [] [] [] [] [] [] | 54 - iso_3166_2 | [] [] | 4 - iso_4217 | [] [] [] [] [] | 24 - iso_639 | [] [] [] [] [] | 26 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] [] | 13 - keytouch | [] | 8 - keytouch-editor | [] | 5 - keytouch-keyboa... | [] | 5 - latrine | [] [] | 5 - ld | [] [] [] [] | 10 - leafpad | [] [] [] [] [] | 24 - libc | [] [] [] | 19 - libexif | [] | 5 - libextractor | [] | 5 - libgpewidget | [] [] [] | 20 - libgpg-error | [] | 6 - libgphoto2 | [] [] | 9 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] [] | 11 - libidn | [] [] | 11 - lifelines | | 4 - lilypond | [] | 6 - lingoteach | [] | 6 - lprng | [] | 2 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailfromd | [] [] | 3 - mailutils | [] [] | 8 - make | [] [] [] | 20 - man-db | [] | 9 - minicom | [] | 14 - nano | [] [] [] | 20 - opcodes | [] [] | 10 - parted | [] [] [] | 11 - pilot-qof | [] | 1 - popt | [] [] [] [] | 18 - psmisc | [] [] | 10 - pwdutils | [] | 3 - qof | [] | 4 - radius | [] [] | 7 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 13 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] [] | 23 - shared-mime-info | [] [] [] | 29 - sharutils | [] [] [] | 23 - shishi | [] | 3 - skencil | [] | 7 - solfege | [] | 3 - soundtracker | [] [] | 9 - sp | [] | 3 - system-tools-ba... | [] [] [] [] [] [] [] | 38 - tar | [] [] [] | 17 - texinfo | [] [] [] | 15 - tin | | 1 - tuxpaint | [] [] [] | 19 - unicode-han-tra... | | 0 - unicode-transla... | | 2 - util-linux | [] [] [] | 20 - util-linux-ng | [] [] [] | 20 - vorbis-tools | [] [] | 4 - wastesedge | | 1 - wdiff | [] [] | 23 - wget | [] [] [] | 20 - xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] | 14 - xpad | [] [] [] | 15 - +---------------------------------------------------+ - 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 - - Some counters in the preceding matrix are higher than the number of -visible blocks let us expect. This is because a few extra PO files are -used for implementing regional variants of languages, or language -dialects. - - For a PO file in the matrix above to be effective, the package to -which it applies should also have been internationalized and -distributed as such by its maintainer. There might be an observable -lag between the mere existence a PO file and its wide availability in a -distribution. - - If November 2007 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at -`http://translationproject.org/extra/matrix.html'. - -1.6 Using `gettext' in new packages -=================================== - -If you are writing a freely available program and want to -internationalize it you are welcome to use GNU `gettext' in your -package. Of course you have to respect the GNU Library General Public -License which covers the use of the GNU `gettext' library. This means -in particular that even non-free programs can use `libintl' as a shared -library, whereas only free software can use `libintl' as a static -library or use modified versions of `libintl'. - - Once the sources are changed appropriately and the setup can handle -the use of `gettext' the only thing missing are the translations. The -Free Translation Project is also available for packages which are not -developed inside the GNU project. Therefore the information given above -applies also for every other Free Software Project. Contact -`coordinator@translationproject.org' to make the `.pot' files available -to the translation teams. - diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/ChangeLog clutter-0.7.4/ChangeLog --- clutter-0.7.2/ChangeLog 2008-06-23 17:00:32.000000000 +0100 +++ clutter-0.7.4/ChangeLog 2008-06-25 17:58:16.000000000 +0100 @@ -1,3 +1,282 @@ +======== Release 0.7.4 ======================================================== + +2008-06-25 Emmanuele Bassi + + * configure.ac: + * NEWS: Release 0.7.4. + +2008-06-25 Neil Roberts + + * clutter/win32/clutter-backend-win32.c + (clutter_backend_win32_get_display_size): Implement + get_display_size on the Win32 backend. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-main.h: Make the priority constants public. + + * clutter/clutter-stage.c: Use CLUTTER_PRIORITY_REDRAW. + + * clutter/clutter-timeline.c: Use CLUTTER_PRIORITY_TIMELINE. + +2008-06-25 Emmanuele Bassi + + * clutter/osx/clutter-backend-osx.c: + (clutter_backend_osx_get_display_size), + (clutter_backend_osx_class_init): Implement the get_display_size + function. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-actor.c: + (clutter_actor_set_min_width), + (clutter_actor_set_min_height), + (clutter_actor_set_natural_width), + (clutter_actor_set_natural_height): Add a comment explaining + the override in place for backends providing a fixed size + on a stage. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-actor.c: + (clutter_actor_set_min_width), + (clutter_actor_set_min_height), + (clutter_actor_set_natural_width), + (clutter_actor_set_natural_height): If setting the minimum + and natural width and height on a top-level actor, and on + a backend that provides only static stages, then override + the value and use the size of the display as returned by + the backend. + + * clutter/eglnative/clutter-stage-egl.c: + (clutter_stage_egl_realize): Remove the setting of the + minimum and natural width and height. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-stage.c: + (clutter_stage_allocate): Minor optimization. + + (clutter_stage_init): Do not set the minimum size of the + stage wrapper, and require that the backends set the size + themselves. + +2008-06-25 Emmanuele Bassi + + * clutter/eglnative/clutter-stage-egl.c: + (clutter_stage_egl_realize): Try to force the minimum and + natural size on realization. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-backend.c: + (clutter_backend_get_display_size): Provide a fallback for + backends not implementing get_display_size(). + + * clutter/clutter-stage.c: + (clutter_stage_allocate): Add debug messages. + + * clutter/sdl/clutter-backend-sdl.c: + (clutter_backend_sdl_get_display_size), + (clutter_backend_sdl_class_init): Implement get_display_size() + on the SDL backend. + +2008-06-25 Chris Lord + + * clutter/clutter-fixed.c: (clutter_sinx): + Fix clutter_sinx for angles > CFX_2PI - CFX_ONE. Also add note to + documentation about being able to use modulus with ClutterFixed + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-backend.h: + * clutter/clutter-backend.c: + (clutter_backend_get_display_size): Add a function for getting the + display size out of the backend. + + * clutter/clutter-stage.c: + (clutter_stage_allocate): When allocating on a backend with a + static stage, we simply ignore the passed box and override it with + the size of the display. + + * clutter/eglnative/clutter-backend-egl.c: + (clutter_backend_egl_get_display_size), + (clutter_backend_egl_class_init): Implement get_display_size() by + returning the size of the EGL surface. + + * clutter/fruity/clutter-backend-fruity.c: + (clutter_backend_egl_get_display_size), + (clutter_backend_egl_class_init): Ditto as above. + + * clutter/x11/clutter-backend-x11.c: + (clutter_backend_x11_get_display_size), + (clutter_backend_x11_class_init): Implement get_display_size() by + returning the DisplayWidth and DisplayHeight of the current + screen. + +2008-06-25 Neil Roberts + + * clutter/win32/clutter-stage-win32.c + (clutter_stage_win32_realize): Use a more direct method to choose + the best pixel format instead of ChoosePixelFormat because + otherwise if the display's depth is 16 then it will prefer the + non-accelerated software implementation when the requested depth + is 24. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-stage.c (clutter_stage_allocate): Fix condition; + should always test before committing. + +2008-06-25 Matthew Allum + + * clutter/x11/clutter-backend-x11.c: (_clutter_x11_register_xinput) + Add extra safety and fallback if no useable pointing devices are + found. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-stage.c: + (clutter_stage_allocate): Check if the stage provided by the + backend is static (i.e. a framebuffer that cannot be resized) + and interrupt the allocation chain there. + + * clutter/eglnative/clutter-stage-egl.c: + (clutter_stage_egl_class_init): Remove the ::allocate empty + stub. + +2008-06-25 Matthew Allum + + * clutter/eglnative/clutter-stage-egl.c: + * clutter/eglx/clutter-stage-egl.c: + Disable passing of attribs to eglCreateContext() on GLES 1.1 h/w + +2008-06-25 Neil Roberts + + * clutter/clutter-actor.c (clutter_actor_paint): Guard against the + actor clip being enabled or disabled in an actor paint + method. Otherwise the clip stack can be become unbalanced. This + was happening in ClutterEntry until it was fixed in revision 2983. + +2008-06-24 Neil Roberts + + Bug 979 - Wrong call convension for SwapIntervalProc in win32 backend + + * clutter/win32/clutter-backend-win32.c: Use the correct calling + convention for SwapInterval. Thanks to Haakon Sporsheim. + +2008-06-24 Emmanuele Bassi + + Bug 989 - Add a search path for clutter script assets + + * clutter/clutter-script.h: + * clutter/clutter-script.c: + (clutter_script_finalize), + (clutter_script_add_search_paths), + (clutter_script_lookup_filename): Add the ability to define multiple + search paths inside ClutterScript and to look up a specific filename + inside those search paths. This is useful to define a set of + directories where the assets for a UI definition are and still + reference those assets by their name instead of the full path. (989, + based on a patch by Matthew Allum) + + * clutter/clutter-texture.c: + (clutter_texture_set_custom_property): Use the newly added + clutter_script_lookup_filename() function. + +2008-06-24 Neil Roberts + + * clutter/cogl/gles/cogl-gles2-wrapper.h: + * clutter/cogl/gles/cogl-gles2-wrapper.c: All of the settings and + uniforms are now proxied into COGL variables instead of setting + the GL uniforms directly. Just before glDrawArrays is executed a + shader is generated using the given settings to avoid using 'if' + statements. The shaders are cached. + + * clutter/cogl/gles/cogl-fixed-vertex-shader.glsl: + * clutter/cogl/gles/cogl-fixed-fragment-shader.glsl: The shaders + are now split into parts using comments instead of 'if' statements + so that the simplest shader can be generated on the fly. + + * clutter/cogl/gles/stringify.sh: Now splits up the shader sources + into separate C strings where deliminated by special comments. + + * clutter/cogl/gles/cogl-program.h: + * clutter/cogl/gles/cogl-program.c: A custom shader can no longer + be directly linked with the fixed-functionality replacement + because the replacement changes depending on the settings. Instead + the bound shader is linked with the appropriate replacement shader + just before glDrawArrays is executed. The custom uniform variables + must also be proxied through COGL variables because their location + can change when relinked. + +2008-06-24 Øyvind Kolås + + * clutter/fruity/clutter-fruity.c: removed dead code and unused + variables. + +2008-06-24 Øyvind Kolås + + * configure.ac: better alignment of list of enabled experimental + features. + +2008-06-24 Emmanuele Bassi + + * doc/clutter-actor-invariants.txt: Fix grammar and spelling, + document the ::parent-set signal emission. + +2008-06-24 Emmanuele Bassi + + * clutter/clutter-entry.c: + (clutter_entry_ensure_layout): Convert the invisible char + to UTF-8 to avoid Pango barfing on us. + +2008-06-24 Matthew Allum + + * clutter/eglnative/clutter-stage-egl.c: + Add an extra debug note. + * configure.ac: + Generate version.xml for COGL API docs + +2008-06-24 Chris Lord + + Bug 988 - cursor position wrong with multibyte invisible char + + * clutter/clutter-entry.c: (clutter_entry_ensure_cursor_position): + Fix cursor position calculation when using invisible text + +2008-06-23 Emmanuele Bassi + + * clutter/x11/clutter-event-x11.c (event_translate): Set the + event type explicitly in the union members as well for the + key events, like we do for all the other events. + +2008-06-23 Neil Roberts + + * clutter/clutter-entry.c (clutter_entry_paint): Set the clip + using COGL directly instead of setting the actor clip. Otherwise + the clip stack will be unbalanced after the first draw. This also + frees up the actor clip to be set by an application. + +2008-06-23 Matthew Allum + + * NEWS: + Add a quick note on fruity multiple deivce support. + * README: + Add multiple device support details and some tweaks on + Clutter requirements (i.e GdkPixbuf). + +2008-06-23 Matthew Allum + + Bug 987 - clutter-event.c c99 variable declaration + + * clutter/clutter-event.c: + Remove c99ism. + +2008-06-23 Emmanuele Bassi + + * configure.ac: Post release bump to 0.7.3. + ======== Release 0.7.2 ======================================================== 2008-06-23 Emmanuele Bassi diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/Makefile.in clutter-0.7.4/Makefile.in --- clutter-0.7.2/Makefile.in 2008-06-23 17:11:38.000000000 +0100 +++ clutter-0.7.4/Makefile.in 2008-06-25 17:49:37.000000000 +0100 @@ -36,10 +36,9 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/clutter.pc.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ - config.rpath config.sub depcomp install-sh ltmain.sh missing \ - mkinstalldirs + $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ + ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ + install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/NEWS clutter-0.7.4/NEWS --- clutter-0.7.2/NEWS 2008-06-23 16:51:41.000000000 +0100 +++ clutter-0.7.4/NEWS 2008-06-25 17:25:27.000000000 +0100 @@ -1,3 +1,40 @@ +Clutter 0.7.4 (25/06/2008), "Killer Koi" +=============================================================================== + + * List of changes between 0.7.2 and 0.7.4 + + o Fix the ClutterEntry actor after the clip API changes in COGL. + + o Update the shaders generated for GLES 2.0. + + o Add the ability to add search paths and look up files from + ClutterScript. This allows defining directories to store the + images to be loaded by a ClutterTexture. + + o Fix the GLES 1.1 support. + + o Warn if no usable pointer device are available on X11 backends. + + o Improve the request for the best pixel format on win32. + + o Fix a regression when sizing the ClutterStage on backends that + only support fixed size stages; now setting any size will result + in Clutter ignoring the request, like it happened in Clutter 0.6. + + o Add a method to ClutterBackend to retrieve the display size. + + o Fix clutter_sinx() for angles > CFX_2PI - CFX_ONE. + + * List of bugs fixed + + o #833 - ClutterEntry should clip glyphs rather than itself + o #858 - Support for multiple devices (using XINPUT) + o #879 - sampler2DRect used by test-shader.c doen't work with non-rect textures + o #979 - Wrong call convension for SwapIntervalProc in win32 backend + o #987 - clutter-event.c c99 variable declaration + o #988 - cursor position wrong with multibyte invisible char + o #989 - Add a search path for clutter script assets + Clutter 0.7.2 (23/06/2008), "Kedoke" =============================================================================== @@ -15,7 +52,9 @@ support for multiple input devices. The API is X11-specific, and provides support for querying at run-time support for XINPUT, for getting a list of input devices and for getting the type of each - input device. + input device. + + o The 'fruity' backend also features multiple device support. * List of bugs fixed @@ -36,7 +75,7 @@ Clutter 0.7.0 (13/06/2008), "Booska" =============================================================================== - * List of changes between 0.6 and 0.7.2 + * List of changes between 0.6 and 0.7.0 o COGL, the underlying GL abstraction layer in Clutter, has been completely rewritten from the ground up. Its no longer a conceptual diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/README clutter-0.7.4/README --- clutter-0.7.2/README 2008-06-14 11:26:53.000000000 +0100 +++ clutter-0.7.4/README 2008-06-25 17:25:16.000000000 +0100 @@ -7,7 +7,6 @@ Clutter currently requires: * GLib >= 2.14.0 - * GdkPixbuf * PangoCairo >= 1.18 * OpenGL >= 1.4, OpenGL ES 1.1 or OpenGL ES 2.0 * GLX, SDL, WGL or an EGL Implementation @@ -81,7 +80,7 @@ Select the image loading backend used by COGL gdk-pixbuf: Depend on gdk-pixbuf-2.0 (default for the glx, eglx, - eglnative, sdl, win32 flavours) + eglnative, sdl, win32 flavours and recommended) quartz: Depend on CoreGraphics (default for the osx flavour) @@ -134,7 +133,7 @@ In the report you should include: * what system you're running Clutter on; * which version of Clutter you are using; -* which version of GLib, GdkPixbuf and OpenGL you are using; +* which version of GLib and OpenGL you are using; * which video card and which drivers you are using, including output of glxinfo and xdpyinfo; * how to reproduce the bug. @@ -171,6 +170,12 @@ Release Notes for Clutter 0.8 ------------------------------- +* Clutter now has basic suppport for multiple input devices assuming + the backend supports it (currently X11 based via XInput and Fruity + backends). New API supporting this includes + clutter_event_get_device_id, clutter_get_input_device_for_id, + clutter_grab_pointer_for_device & clutter_ungrab_pointer_for_device. + * The functions that return the transformed position of an actor have been renamed to be more explicit about it: @@ -470,4 +475,4 @@ ClutterContainer::actor-added and ClutterContainer::actor-removed should be used instead. -$LastChangedDate: 2008-06-14 11:27:01 +0100 (Sat, 14 Jun 2008) $ +$LastChangedDate: 2008-06-23 21:26:47 +0100 (Mon, 23 Jun 2008) $ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-actor.c clutter-0.7.4/clutter/clutter-actor.c --- clutter-0.7.2/clutter/clutter-actor.c 2008-06-23 10:59:28.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-actor.c 2008-06-25 17:25:15.000000000 +0100 @@ -1391,6 +1391,7 @@ { ClutterActorPrivate *priv; ClutterMainContext *context; + gboolean clip_set = FALSE; g_return_if_fail (CLUTTER_IS_ACTOR (self)); @@ -1413,10 +1414,13 @@ _clutter_actor_apply_modelview_transform (self); if (priv->has_clip) - cogl_clip_set (CLUTTER_UNITS_TO_FIXED (priv->clip[0]), - CLUTTER_UNITS_TO_FIXED (priv->clip[1]), - CLUTTER_UNITS_TO_FIXED (priv->clip[2]), - CLUTTER_UNITS_TO_FIXED (priv->clip[3])); + { + cogl_clip_set (CLUTTER_UNITS_TO_FIXED (priv->clip[0]), + CLUTTER_UNITS_TO_FIXED (priv->clip[1]), + CLUTTER_UNITS_TO_FIXED (priv->clip[2]), + CLUTTER_UNITS_TO_FIXED (priv->clip[3])); + clip_set = TRUE; + } context = clutter_context_get_default (); if (G_UNLIKELY (context->pick_mode != CLUTTER_PICK_NONE)) @@ -1440,7 +1444,7 @@ clutter_actor_shader_post_paint (self); } - if (priv->has_clip) + if (clip_set) cogl_clip_unset(); cogl_pop_matrix(); @@ -3637,6 +3641,26 @@ ClutterActorPrivate *priv = self->priv; ClutterActorBox old = { 0, }; + /* override the minimum width on a top-level actor in case + * we are working on a backend that only provides a fixed + * size stage (e.g. on a framebuffer) + */ + if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) + { + if (clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC)) + { + ClutterBackend *backend = clutter_get_default_backend (); + gint display_width; + + clutter_backend_get_display_size (backend, + &display_width, + NULL); + + if (min_width != (CLUTTER_UNITS_FROM_DEVICE (display_width))) + min_width = CLUTTER_UNITS_FROM_DEVICE (display_width); + } + } + if (priv->min_width_set && min_width == priv->request_min_width) return; @@ -3663,6 +3687,26 @@ ClutterActorPrivate *priv = self->priv; ClutterActorBox old = { 0, }; + /* override the minimum height on a top-level actor in case + * we are working on a backend that only provides a fixed + * size stage (e.g. on a framebuffer) + */ + if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) + { + if (clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC)) + { + ClutterBackend *backend = clutter_get_default_backend (); + gint display_height; + + clutter_backend_get_display_size (backend, + NULL, + &display_height); + + if (min_height != (CLUTTER_UNITS_FROM_DEVICE (display_height))) + min_height = CLUTTER_UNITS_FROM_DEVICE (display_height); + } + } + if (priv->min_height_set && min_height == priv->request_min_height) return; @@ -3688,6 +3732,26 @@ ClutterActorPrivate *priv = self->priv; ClutterActorBox old = { 0, }; + /* override the natural width on a top-level actor in case + * we are working on a backend that only provides a fixed + * size stage (e.g. on a framebuffer) + */ + if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) + { + if (clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC)) + { + ClutterBackend *backend = clutter_get_default_backend (); + gint display_width; + + clutter_backend_get_display_size (backend, + &display_width, + NULL); + + if (natural_width != (CLUTTER_UNITS_FROM_DEVICE (display_width))) + natural_width = CLUTTER_UNITS_FROM_DEVICE (display_width); + } + } + if (priv->natural_width_set && natural_width == priv->request_natural_width) return; @@ -3714,6 +3778,26 @@ ClutterActorPrivate *priv = self->priv; ClutterActorBox old = { 0, }; + /* override the natural height on a top-level actor in case + * we are working on a backend that only provides a fixed + * size stage (e.g. on a framebuffer) + */ + if (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL) + { + if (clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC)) + { + ClutterBackend *backend = clutter_get_default_backend (); + gint display_height; + + clutter_backend_get_display_size (backend, + NULL, + &display_height); + + if (natural_height != (CLUTTER_UNITS_FROM_DEVICE (display_height))) + natural_height = CLUTTER_UNITS_FROM_DEVICE (display_height); + } + } + if (priv->natural_height_set && natural_height == priv->request_natural_height) return; diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-backend.c clutter-0.7.4/clutter/clutter-backend.c --- clutter-0.7.2/clutter/clutter-backend.c 2008-06-12 11:46:24.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-backend.c 2008-06-25 17:25:15.000000000 +0100 @@ -481,3 +481,35 @@ return priv->font_options; } + +/** + * clutter_backend_get_display_size: + * @backend: a #ClutterBackend + * @width: return location for the display width in pixels, or %NULL + * @height: return location for the display height in pixels, or %NULL + * + * Retrieves the size of the display from the #ClutterBackend. + * + * Since: 0.8 + */ +void +clutter_backend_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + ClutterBackendClass *klass; + + g_return_if_fail (CLUTTER_IS_BACKEND (backend)); + + klass = CLUTTER_BACKEND_GET_CLASS (backend); + if (!klass->get_display_size) + { + if (width) + *width = 0; + + if (height) + *height = 0; + } + else + klass->get_display_size (backend, width, height); +} diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-backend.h clutter-0.7.4/clutter/clutter-backend.h --- clutter-0.7.2/clutter/clutter-backend.h 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-backend.h 2008-06-25 17:25:15.000000000 +0100 @@ -59,22 +59,25 @@ GObjectClass parent_class; /* vfuncs */ - gboolean (* pre_parse) (ClutterBackend *backend, - GError **error); - gboolean (* post_parse) (ClutterBackend *backend, - GError **error); - ClutterActor * (* create_stage) (ClutterBackend *backend, - ClutterStage *wrapper, - GError **error); - void (* init_events) (ClutterBackend *backend); - void (* init_features) (ClutterBackend *backend); - void (* add_options) (ClutterBackend *backend, - GOptionGroup *group); - ClutterFeatureFlags (* get_features) (ClutterBackend *backend); - void (* redraw) (ClutterBackend *backend, - ClutterStage *stage); - void (* ensure_context) (ClutterBackend *backend, - ClutterStage *stage); + gboolean (* pre_parse) (ClutterBackend *backend, + GError **error); + gboolean (* post_parse) (ClutterBackend *backend, + GError **error); + ClutterActor * (* create_stage) (ClutterBackend *backend, + ClutterStage *wrapper, + GError **error); + void (* init_events) (ClutterBackend *backend); + void (* init_features) (ClutterBackend *backend); + void (* add_options) (ClutterBackend *backend, + GOptionGroup *group); + ClutterFeatureFlags (* get_features) (ClutterBackend *backend); + void (* redraw) (ClutterBackend *backend, + ClutterStage *stage); + void (* ensure_context) (ClutterBackend *backend, + ClutterStage *stage); + void (* get_display_size) (ClutterBackend *backend, + gint *width, + gint *height); }; GType clutter_backend_get_type (void) G_GNUC_CONST; @@ -93,6 +96,9 @@ void clutter_backend_set_font_options (ClutterBackend *backend, cairo_font_options_t *options); cairo_font_options_t *clutter_backend_get_font_options (ClutterBackend *backend); +void clutter_backend_get_display_size (ClutterBackend *backend, + gint *width, + gint *height); G_END_DECLS diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-entry.c clutter-0.7.4/clutter/clutter-entry.c --- clutter-0.7.2/clutter/clutter-entry.c 2008-06-23 11:30:56.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-entry.c 2008-06-25 17:25:15.000000000 +0100 @@ -4,7 +4,7 @@ * An OpenGL based 'interactive canvas' library. * * Authored By Matthew Allum - * Neil Jagdish Patel * * Copyright (C) 2006 OpenedHand * @@ -277,17 +277,25 @@ { GString *str = g_string_sized_new (priv->n_bytes); gunichar invisible_char; - gint i; + gchar buf[7]; + gint char_len, i; if (priv->priv_char != 0) invisible_char = priv->priv_char; else invisible_char = '*'; + /* we need to convert the string built of invisible characters + * into UTF-8 for it to be fed to the Pango layout + */ + memset (buf, 0, sizeof (buf)); + char_len = g_unichar_to_utf8 (invisible_char, buf); + for (i = 0; i < priv->n_chars; i++) - g_string_append_unichar (str, invisible_char); + g_string_append_len (str, buf, char_len); pango_layout_set_text (priv->layout, str->str, str->len); + g_string_free (str, TRUE); } @@ -350,13 +358,32 @@ ClutterEntryPrivate *priv; gint index_; PangoRectangle rect; + gint priv_char_bytes; priv = entry->priv; + /* If characters are invisible, get the byte-length of the invisible + * character. If priv_char is 0, we use '*', which is ASCII (1 byte). + */ + if (!priv->text_visible && priv->priv_char) + priv_char_bytes = g_unichar_to_utf8 (priv->priv_char, NULL); + else + priv_char_bytes = 1; + if (priv->position == -1) - index_ = strlen (priv->text); + { + if (priv->text_visible) + index_ = strlen (priv->text); + else + index_ = priv->n_chars * priv_char_bytes; + } else - index_ = offset_to_bytes (priv->text, priv->position); + { + if (priv->text_visible) + index_ = offset_to_bytes (priv->text, priv->position); + else + index_ = priv->position * priv_char_bytes; + } pango_layout_get_cursor_pos (priv->layout, index_, &rect, NULL); priv->cursor_pos.x = rect.x / PANGO_SCALE; @@ -422,9 +449,8 @@ else width = priv->width; - clutter_actor_set_clip (self, 0, 0, - width, - clutter_actor_get_height (self)); + cogl_clip_set (0, 0, CLUTTER_INT_TO_FIXED (width), + CLUTTER_INT_TO_FIXED (clutter_actor_get_height (self))); actor_width = width - (2 * priv->entry_padding); clutter_entry_ensure_layout (entry, actor_width); @@ -482,6 +508,8 @@ if (CLUTTER_ENTRY_GET_CLASS (entry)->paint_cursor) CLUTTER_ENTRY_GET_CLASS (entry)->paint_cursor (entry); + + cogl_clip_unset (); } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-event.c clutter-0.7.4/clutter/clutter-event.c --- clutter-0.7.2/clutter/clutter-event.c 2008-06-23 10:59:28.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-event.c 2008-06-25 17:25:15.000000000 +0100 @@ -327,10 +327,10 @@ gint clutter_event_get_device_id (ClutterEvent *event) { - g_return_val_if_fail (-1, event != NULL); - ClutterInputDevice *device = NULL; + g_return_val_if_fail (-1, event != NULL); + switch (event->type) { case CLUTTER_NOTHING: diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-fixed.c clutter-0.7.4/clutter/clutter-fixed.c --- clutter-0.7.2/clutter/clutter-fixed.c 2008-06-12 11:47:14.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-fixed.c 2008-06-25 17:25:15.000000000 +0100 @@ -50,8 +50,8 @@ * * * - * Two fixed point numbers can be directly added and - * subtracted. + * Two fixed point numbers can be directly added, + * subtracted and have their modulus taken. * * * To add other numerical type to a fixed point number it has to @@ -264,11 +264,7 @@ } /* reduce to <0, 2*pi) */ - if (angle >= CFX_2PI) - { - ClutterFixed f = CLUTTER_FIXED_DIV (angle, CFX_2PI); - angle = angle - f; - } + angle = angle % CFX_2PI; /* reduce to first quadrant and sign */ if (angle > CFX_PI) diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-main.h clutter-0.7.4/clutter/clutter-main.h --- clutter-0.7.2/clutter/clutter-main.h 2008-06-23 10:59:28.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-main.h 2008-06-25 17:46:40.000000000 +0100 @@ -31,6 +31,11 @@ G_BEGIN_DECLS +/** + * CLUTTER_INIT_ERROR: + * + * #GError domain for #ClutterInitError + */ #define CLUTTER_INIT_ERROR (clutter_init_error_quark ()) /** @@ -55,6 +60,24 @@ GQuark clutter_init_error_quark (void); +/** + * CLUTTER_PRIORITY_REDRAW: + * + * Priority of the redraws. + * + * Since: 0.8 + */ +#define CLUTTER_PRIORITY_REDRAW (G_PRIORITY_DEFAULT + 10) + +/** + * CLUTTER_PRIORITY_TIMELINE: + * + * Priority of the timelines. + * + * Since: 0.8 + */ +#define CLUTTER_PRIORITY_TIMELINE (G_PRIORITY_DEFAULT + 30) + /* Initialisation */ void clutter_base_init (void); ClutterInitError clutter_init (int *argc, diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-script.c clutter-0.7.4/clutter/clutter-script.c --- clutter-0.7.2/clutter/clutter-script.c 2008-06-18 09:44:10.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-script.c 2008-06-25 17:25:15.000000000 +0100 @@ -201,6 +201,8 @@ JsonParser *parser; + gchar **search_paths; + gchar *filename; guint is_filename : 1; }; @@ -1544,6 +1546,7 @@ g_object_unref (priv->parser); g_hash_table_destroy (priv->objects); + g_strfreev (priv->search_paths); g_free (priv->filename); G_OBJECT_CLASS (clutter_script_parent_class)->finalize (gobject); @@ -2156,3 +2159,126 @@ { return g_quark_from_static_string ("clutter-script-error"); } + +/** + * clutter_script_add_search_paths: + * @script: a #ClutterScript + * @paths: an array of strings containing different search paths + * @n_paths: the length of the passed array + * + * Adds @paths to the list of search paths held by @script. + * + * The search paths are used by clutter_script_lookup_filename(), which + * can be used to define search paths for the textures source file name + * or other custom, file-based properties. + * + * Since: 0.8 + */ +void +clutter_script_add_search_paths (ClutterScript *script, + const gchar * const paths[], + gsize n_paths) +{ + ClutterScriptPrivate *priv; + gchar **old_paths, **new_paths; + gsize old_paths_len, i; + gsize iter = 0; + + g_return_if_fail (CLUTTER_IS_SCRIPT (script)); + g_return_if_fail (paths != NULL); + g_return_if_fail (n_paths > 0); + + priv = script->priv; + + if (priv->search_paths) + { + old_paths = priv->search_paths; + old_paths_len = g_strv_length (old_paths); + } + else + { + old_paths = NULL; + old_paths_len = 0; + } + + new_paths = g_new0 (gchar*, old_paths_len + n_paths + 1); + + for (i = 0, iter = 0; i < old_paths_len; i++, iter++) + new_paths[iter] = g_strdup (old_paths[i]); + + for (i = 0; i < n_paths; i++, iter++) + new_paths[iter] = g_strdup (paths[i]); + + CLUTTER_NOTE (SCRIPT, "Added %d new search paths (new size: %d)", + n_paths, + g_strv_length (new_paths)); + + priv->search_paths = new_paths; + g_strfreev (old_paths); +} + +/** + * clutter_script_lookup_filename: + * @script: a #ClutterScript + * @filename: the name of the file to lookup + * + * Looks up @filename inside the search paths of @script. If @filename + * is found, its full path will be returned . + * + * Return value: the full path of @filename or %NULL if no path was + * found. + * + * Since: 0.8 + */ +gchar * +clutter_script_lookup_filename (ClutterScript *script, + const gchar *filename) +{ + ClutterScriptPrivate *priv; + gchar *dirname; + gchar *retval; + + g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), FALSE); + g_return_val_if_fail (filename != NULL, FALSE); + + if (g_path_is_absolute (filename)) + return g_strdup (filename); + + priv = script->priv; + + if (priv->search_paths) + { + gsize paths_len, i; + + paths_len = g_strv_length (priv->search_paths); + for (i = 0; i < paths_len; i++) + { + retval = g_build_filename (priv->search_paths[i], filename, NULL); + if (g_file_test (retval, G_FILE_TEST_EXISTS)) + return retval; + else + { + g_free (retval); + retval = NULL; + } + } + } + + /* Fall back to assuming relative to our script */ + if (priv->is_filename) + dirname = g_path_get_dirname (script->priv->filename); + else + dirname = g_get_current_dir (); + + retval = g_build_filename (dirname, filename, NULL); + if (!g_file_test (retval, G_FILE_TEST_EXISTS)) + { + g_free (retval); + retval = NULL; + } + + g_free (dirname); + + return retval; +} + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-script.h clutter-0.7.4/clutter/clutter-script.h --- clutter-0.7.2/clutter/clutter-script.h 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-script.h 2008-06-25 17:25:15.000000000 +0100 @@ -145,6 +145,12 @@ ClutterScriptConnectFunc func, gpointer user_data); +void clutter_script_add_search_paths (ClutterScript *script, + const gchar * const paths[], + gsize n_paths); +gchar * clutter_script_lookup_filename (ClutterScript *script, + const gchar *filename) G_GNUC_MALLOC; + G_END_DECLS #endif /* __CLUTTER_SCRIPT_H__ */ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-stage.c clutter-0.7.4/clutter/clutter-stage.c --- clutter-0.7.2/clutter/clutter-stage.c 2008-06-23 10:57:37.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-stage.c 2008-06-25 17:46:40.000000000 +0100 @@ -152,21 +152,58 @@ natural_height_p); } static void -clutter_stage_allocate (ClutterActor *self, - const ClutterActorBox *box, - gboolean origin_changed) +clutter_stage_allocate (ClutterActor *self, + const ClutterActorBox *box, + gboolean origin_changed) { ClutterStagePrivate *priv = CLUTTER_STAGE (self)->priv; g_assert (priv->impl != NULL); - CLUTTER_ACTOR_GET_CLASS (priv->impl)->allocate (priv->impl, - box, - origin_changed); + /* if the stage is fixed size (for instance, it's using a frame-buffer) + * then we simply ignore any allocation request and override the + * allocation chain. + */ + if (G_LIKELY (!clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC))) + { + ClutterActorClass *klass; - CLUTTER_ACTOR_CLASS (clutter_stage_parent_class)->allocate (self, - box, - origin_changed); + CLUTTER_NOTE (ACTOR, "Following allocation to %dx%d (origin %s)", + CLUTTER_UNITS_TO_DEVICE (box->x2 - box->x1), + CLUTTER_UNITS_TO_DEVICE (box->y2 - box->y1), + origin_changed ? "changed" : "not changed"); + + klass = CLUTTER_ACTOR_CLASS (clutter_stage_parent_class); + klass->allocate (self, box, origin_changed); + + klass = CLUTTER_ACTOR_GET_CLASS (priv->impl); + klass->allocate (priv->impl, box, origin_changed); + } + else + { + ClutterActorBox override = { 0, }; + ClutterBackend *backend = clutter_get_default_backend (); + gint display_width, display_height; + ClutterActorClass *klass; + + display_width = display_height = 0; + clutter_backend_get_display_size (backend, + &display_width, + &display_height); + + override.x1 = 0; + override.y1 = 0; + override.x2 = CLUTTER_UNITS_FROM_DEVICE (display_width); + override.y2 = CLUTTER_UNITS_FROM_DEVICE (display_height); + + CLUTTER_NOTE (ACTOR, "Overriding allocation to %dx%d (origin: %s)", + display_width, + display_height, + origin_changed ? "changed" : "not changed"); + + klass = CLUTTER_ACTOR_CLASS (clutter_stage_parent_class); + klass->allocate (self, &override, origin_changed); + } } static void @@ -681,7 +718,6 @@ priv->fog.z_near = CLUTTER_FLOAT_TO_FIXED (1.0); priv->fog.z_far = CLUTTER_FLOAT_TO_FIXED (2.0); - clutter_actor_set_size (CLUTTER_ACTOR (self), 640, 480); clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE); clutter_stage_set_key_focus (self, NULL); } @@ -1768,7 +1804,7 @@ /* FIXME: weak_ref self in case we dissapear before paint? */ stage->priv->update_idle = - clutter_threads_add_idle_full (G_PRIORITY_DEFAULT + 10, + clutter_threads_add_idle_full (CLUTTER_PRIORITY_REDRAW, redraw_update_idle, stage, NULL); diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-texture.c clutter-0.7.4/clutter/clutter-texture.c --- clutter-0.7.2/clutter/clutter-texture.c 2008-06-23 16:26:20.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-texture.c 2008-06-25 17:25:15.000000000 +0100 @@ -807,29 +807,9 @@ gchar *path; GError *error; - if (g_path_is_absolute (str)) - path = g_strdup (str); - else - { - gchar *dirname = NULL; - gboolean is_filename = FALSE; - - g_object_get (script, "filename-set", &is_filename, NULL); - if (is_filename) - { - gchar *filename = NULL; - - g_object_get (script, "filename", &filename, NULL); - dirname = g_path_get_dirname (filename); - - g_free (filename); - } - else - dirname = g_get_current_dir (); - - path = g_build_filename (dirname, str, NULL); - g_free (dirname); - } + path = clutter_script_lookup_filename (script, str); + if (G_UNLIKELY (!path)) + return; error = NULL; clutter_texture_set_from_file (texture, path, &error); diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-timeline.c clutter-0.7.4/clutter/clutter-timeline.c --- clutter-0.7.2/clutter/clutter-timeline.c 2008-06-15 13:42:16.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-timeline.c 2008-06-25 17:46:40.000000000 +0100 @@ -94,7 +94,6 @@ G_DEFINE_TYPE (ClutterTimeline, clutter_timeline, G_TYPE_OBJECT); #define FPS_TO_INTERVAL(f) (1000 / (f)) -#define CLUTTER_TIMELINE_PRIORITY (G_PRIORITY_DEFAULT + 30) struct _ClutterTimelinePrivate { @@ -169,7 +168,7 @@ } else { - timeline_pool = clutter_timeout_pool_new (CLUTTER_TIMELINE_PRIORITY); + timeline_pool = clutter_timeout_pool_new (CLUTTER_PRIORITY_TIMELINE); timeline_use_pool = TRUE; } } @@ -192,7 +191,7 @@ } else { - res = clutter_threads_add_frame_source_full (CLUTTER_TIMELINE_PRIORITY, + res = clutter_threads_add_frame_source_full (CLUTTER_PRIORITY_TIMELINE, interval, func, data, notify); } diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/clutter-version.h clutter-0.7.4/clutter/clutter-version.h --- clutter-0.7.2/clutter/clutter-version.h 2008-06-23 17:12:55.000000000 +0100 +++ clutter-0.7.4/clutter/clutter-version.h 2008-06-25 17:49:44.000000000 +0100 @@ -53,14 +53,14 @@ * * The micro version of the Clutter library (3, if %CLUTTER_VERSION is 1.2.3) */ -#define CLUTTER_MICRO_VERSION (2) +#define CLUTTER_MICRO_VERSION (4) /** * CLUTTER_VERSION: * * The full version of the Clutter library, like 1.2.3 */ -#define CLUTTER_VERSION 0.7.2 +#define CLUTTER_VERSION 0.7.4 /** * CLUTTER_VERSION_S: @@ -68,7 +68,7 @@ * The full version of the Clutter library, in string form (suited for * string concatenation) */ -#define CLUTTER_VERSION_S "0.7.2" +#define CLUTTER_VERSION_S "0.7.4" /** * CLUTTER_VERSION_HEX: diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-fixed-fragment-shader.c clutter-0.7.4/clutter/cogl/gles/cogl-fixed-fragment-shader.c --- clutter-0.7.2/clutter/cogl/gles/cogl-fixed-fragment-shader.c 2008-06-13 12:30:23.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-fixed-fragment-shader.c 2008-06-25 17:53:39.000000000 +0100 @@ -23,7 +23,9 @@ * Boston, MA 02111-1307, USA. */ -const char cogl_fixed_fragment_shader[] = + ; +const char cogl_fixed_fragment_shader_start[] = + "\n" "/* There is no default precision for floats in fragment shaders in\n" " GLES 2 so we need to define one */\n" "precision mediump float;\n" @@ -34,87 +36,77 @@ "varying float fog_amount;\n" "\n" "/* Texturing options */\n" - "uniform bool texture_2d_enabled;\n" "uniform sampler2D texture_unit;\n" - "uniform bool alpha_only;\n" "\n" "/* Fogging options */\n" - "uniform bool fog_enabled;\n" "uniform vec4 fog_color;\n" "\n" "/* Alpha test options */\n" - "uniform bool alpha_test_enabled;\n" - "uniform int alpha_test_func;\n" "uniform float alpha_test_ref;\n" "\n" - "/* Alpha test functions */\n" - "const int GL_NEVER = 0x0200;\n" - "const int GL_LESS = 0x0201;\n" - "const int GL_EQUAL = 0x0202;\n" - "const int GL_LEQUAL = 0x0203;\n" - "const int GL_GREATER = 0x0204;\n" - "const int GL_NOTEQUAL = 0x0205;\n" - "const int GL_GEQUAL = 0x0206;\n" - "\n" "void\n" "main (void)\n" "{\n" - " if (texture_2d_enabled)\n" - " {\n" - " if (alpha_only)\n" - " {\n" - " /* If the texture only has an alpha channel (eg, with the\n" - " textures from the pango renderer) then the RGB components\n" - " will be black. We want to use the RGB from the current\n" - " color in that case */\n" - " gl_FragColor = frag_color;\n" - " gl_FragColor.a *= texture2D (texture_unit, tex_coord).a;\n" - " }\n" - " else\n" - " gl_FragColor = frag_color * texture2D (texture_unit, tex_coord);\n" - " }\n" - " else\n" - " gl_FragColor = frag_color;\n" + ; +const char cogl_fixed_fragment_shader_texture_alpha_only[] = "\n" - " if (fog_enabled)\n" - " /* Mix the calculated color with the fog color */\n" - " gl_FragColor.rgb = mix (fog_color.rgb, gl_FragColor.rgb, fog_amount);\n" + " /* If the texture only has an alpha channel (eg, with the textures\n" + " from the pango renderer) then the RGB components will be\n" + " black. We want to use the RGB from the current color in that\n" + " case */\n" + " gl_FragColor = frag_color;\n" + " gl_FragColor.a *= texture2D (texture_unit, tex_coord).a;\n" + "\n" + ; +const char cogl_fixed_fragment_shader_texture[] = + "\n" + " /* This pointless extra variable is needed to work around an\n" + " apparent bug in the PowerVR drivers. Without it the alpha\n" + " blending seems to stop working */\n" + " vec4 frag_color_copy = frag_color;\n" + " gl_FragColor = frag_color_copy * texture2D (texture_unit, tex_coord);\n" + "\n" + ; +const char cogl_fixed_fragment_shader_solid_color[] = + " gl_FragColor = frag_color;\n" + "\n" + ; +const char cogl_fixed_fragment_shader_fog[] = + "\n" + " /* Mix the calculated color with the fog color */\n" + " gl_FragColor.rgb = mix (fog_color.rgb, gl_FragColor.rgb, fog_amount);\n" "\n" " /* Alpha testing */\n" - " if (alpha_test_enabled)\n" - " {\n" - " if (alpha_test_func == GL_NEVER)\n" - " discard;\n" - " else if (alpha_test_func == GL_LESS)\n" - " {\n" - " if (gl_FragColor.a >= alpha_test_ref)\n" - " discard;\n" - " }\n" - " else if (alpha_test_func == GL_EQUAL)\n" - " {\n" - " if (gl_FragColor.a != alpha_test_ref)\n" - " discard;\n" - " }\n" - " else if (alpha_test_func == GL_LEQUAL)\n" - " {\n" - " if (gl_FragColor.a > alpha_test_ref)\n" - " discard;\n" - " }\n" - " else if (alpha_test_func == GL_GREATER)\n" - " {\n" - " if (gl_FragColor.a <= alpha_test_ref)\n" - " discard;\n" - " }\n" - " else if (alpha_test_func == GL_NOTEQUAL)\n" - " {\n" - " if (gl_FragColor.a == alpha_test_ref)\n" - " discard;\n" - " }\n" - " else if (alpha_test_func == GL_GEQUAL)\n" - " {\n" - " if (gl_FragColor.a < alpha_test_ref)\n" - " discard;\n" - " }\n" - " }\n" + "\n" + ; +const char cogl_fixed_fragment_shader_alpha_never[] = + " discard;\n" + ; +const char cogl_fixed_fragment_shader_alpha_less[] = + " if (gl_FragColor.a >= alpha_test_ref)\n" + " discard;\n" + ; +const char cogl_fixed_fragment_shader_alpha_equal[] = + " if (gl_FragColor.a != alpha_test_ref)\n" + " discard;\n" + ; +const char cogl_fixed_fragment_shader_alpha_lequal[] = + " if (gl_FragColor.a > alpha_test_ref)\n" + " discard;\n" + ; +const char cogl_fixed_fragment_shader_alpha_greater[] = + " if (gl_FragColor.a <= alpha_test_ref)\n" + " discard;\n" + ; +const char cogl_fixed_fragment_shader_alpha_notequal[] = + " if (gl_FragColor.a == alpha_test_ref)\n" + " discard;\n" + ; +const char cogl_fixed_fragment_shader_alpha_gequal[] = + " if (gl_FragColor.a < alpha_test_ref)\n" + " discard;\n" + "\n" + ; +const char cogl_fixed_fragment_shader_end[] = "}\n" ; diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-fixed-fragment-shader.glsl clutter-0.7.4/clutter/cogl/gles/cogl-fixed-fragment-shader.glsl --- clutter-0.7.2/clutter/cogl/gles/cogl-fixed-fragment-shader.glsl 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-fixed-fragment-shader.glsl 2008-06-25 17:25:14.000000000 +0100 @@ -1,3 +1,5 @@ +/*** cogl_fixed_fragment_shader_start ***/ + /* There is no default precision for floats in fragment shaders in GLES 2 so we need to define one */ precision mediump float; @@ -8,86 +10,64 @@ varying float fog_amount; /* Texturing options */ -uniform bool texture_2d_enabled; uniform sampler2D texture_unit; -uniform bool alpha_only; /* Fogging options */ -uniform bool fog_enabled; uniform vec4 fog_color; /* Alpha test options */ -uniform bool alpha_test_enabled; -uniform int alpha_test_func; uniform float alpha_test_ref; -/* Alpha test functions */ -const int GL_NEVER = 0x0200; -const int GL_LESS = 0x0201; -const int GL_EQUAL = 0x0202; -const int GL_LEQUAL = 0x0203; -const int GL_GREATER = 0x0204; -const int GL_NOTEQUAL = 0x0205; -const int GL_GEQUAL = 0x0206; - void main (void) { - if (texture_2d_enabled) - { - if (alpha_only) - { - /* If the texture only has an alpha channel (eg, with the - textures from the pango renderer) then the RGB components - will be black. We want to use the RGB from the current - color in that case */ - gl_FragColor = frag_color; - gl_FragColor.a *= texture2D (texture_unit, tex_coord).a; - } - else - gl_FragColor = frag_color * texture2D (texture_unit, tex_coord); - } - else - gl_FragColor = frag_color; + /*** cogl_fixed_fragment_shader_texture_alpha_only ***/ - if (fog_enabled) - /* Mix the calculated color with the fog color */ - gl_FragColor.rgb = mix (fog_color.rgb, gl_FragColor.rgb, fog_amount); + /* If the texture only has an alpha channel (eg, with the textures + from the pango renderer) then the RGB components will be + black. We want to use the RGB from the current color in that + case */ + gl_FragColor = frag_color; + gl_FragColor.a *= texture2D (texture_unit, tex_coord).a; + + /*** cogl_fixed_fragment_shader_texture ***/ + + /* This pointless extra variable is needed to work around an + apparent bug in the PowerVR drivers. Without it the alpha + blending seems to stop working */ + vec4 frag_color_copy = frag_color; + gl_FragColor = frag_color_copy * texture2D (texture_unit, tex_coord); + + /*** cogl_fixed_fragment_shader_solid_color ***/ + gl_FragColor = frag_color; + + /*** cogl_fixed_fragment_shader_fog ***/ + + /* Mix the calculated color with the fog color */ + gl_FragColor.rgb = mix (fog_color.rgb, gl_FragColor.rgb, fog_amount); /* Alpha testing */ - if (alpha_test_enabled) - { - if (alpha_test_func == GL_NEVER) - discard; - else if (alpha_test_func == GL_LESS) - { - if (gl_FragColor.a >= alpha_test_ref) - discard; - } - else if (alpha_test_func == GL_EQUAL) - { - if (gl_FragColor.a != alpha_test_ref) - discard; - } - else if (alpha_test_func == GL_LEQUAL) - { - if (gl_FragColor.a > alpha_test_ref) - discard; - } - else if (alpha_test_func == GL_GREATER) - { - if (gl_FragColor.a <= alpha_test_ref) - discard; - } - else if (alpha_test_func == GL_NOTEQUAL) - { - if (gl_FragColor.a == alpha_test_ref) - discard; - } - else if (alpha_test_func == GL_GEQUAL) - { - if (gl_FragColor.a < alpha_test_ref) - discard; - } - } + + /*** cogl_fixed_fragment_shader_alpha_never ***/ + discard; + /*** cogl_fixed_fragment_shader_alpha_less ***/ + if (gl_FragColor.a >= alpha_test_ref) + discard; + /*** cogl_fixed_fragment_shader_alpha_equal ***/ + if (gl_FragColor.a != alpha_test_ref) + discard; + /*** cogl_fixed_fragment_shader_alpha_lequal ***/ + if (gl_FragColor.a > alpha_test_ref) + discard; + /*** cogl_fixed_fragment_shader_alpha_greater ***/ + if (gl_FragColor.a <= alpha_test_ref) + discard; + /*** cogl_fixed_fragment_shader_alpha_notequal ***/ + if (gl_FragColor.a == alpha_test_ref) + discard; + /*** cogl_fixed_fragment_shader_alpha_gequal ***/ + if (gl_FragColor.a < alpha_test_ref) + discard; + + /*** cogl_fixed_fragment_shader_end ***/ } diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-fixed-fragment-shader.h clutter-0.7.4/clutter/cogl/gles/cogl-fixed-fragment-shader.h --- clutter-0.7.2/clutter/cogl/gles/cogl-fixed-fragment-shader.h 2008-06-13 12:30:23.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-fixed-fragment-shader.h 2008-06-25 17:53:39.000000000 +0100 @@ -26,6 +26,18 @@ #ifndef __COGL_FIXED_FRAGMENT_SHADER_H #define __COGL_FIXED_FRAGMENT_SHADER_H -extern const char cogl_fixed_fragment_shader[]; +extern const char cogl_fixed_fragment_shader_start[]; +extern const char cogl_fixed_fragment_shader_texture_alpha_only[]; +extern const char cogl_fixed_fragment_shader_texture[]; +extern const char cogl_fixed_fragment_shader_solid_color[]; +extern const char cogl_fixed_fragment_shader_fog[]; +extern const char cogl_fixed_fragment_shader_alpha_never[]; +extern const char cogl_fixed_fragment_shader_alpha_less[]; +extern const char cogl_fixed_fragment_shader_alpha_equal[]; +extern const char cogl_fixed_fragment_shader_alpha_lequal[]; +extern const char cogl_fixed_fragment_shader_alpha_greater[]; +extern const char cogl_fixed_fragment_shader_alpha_notequal[]; +extern const char cogl_fixed_fragment_shader_alpha_gequal[]; +extern const char cogl_fixed_fragment_shader_end[]; #endif /* __COGL_FIXED_FRAGMENT_SHADER_H */ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-fixed-vertex-shader.c clutter-0.7.4/clutter/cogl/gles/cogl-fixed-vertex-shader.c --- clutter-0.7.2/clutter/cogl/gles/cogl-fixed-vertex-shader.c 2008-06-13 12:30:23.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-fixed-vertex-shader.c 2008-06-25 17:53:39.000000000 +0100 @@ -23,7 +23,9 @@ * Boston, MA 02111-1307, USA. */ -const char cogl_fixed_vertex_shader[] = + ; +const char cogl_fixed_vertex_shader_start[] = + "\n" "/* Per vertex attributes */\n" "attribute vec4 vertex_attrib;\n" "attribute vec4 tex_coord_attrib;\n" @@ -40,17 +42,10 @@ "varying float fog_amount;\n" "\n" "/* Fogging options */\n" - "uniform bool fog_enabled;\n" - "uniform int fog_mode;\n" "uniform float fog_density;\n" "uniform float fog_start;\n" "uniform float fog_end;\n" "\n" - "/* Fogging modes */\n" - "const int GL_LINEAR = 0x2601;\n" - "const int GL_EXP = 0x0800;\n" - "const int GL_EXP2 = 0x0801;\n" - "\n" "void\n" "main (void)\n" "{\n" @@ -64,24 +59,33 @@ " /* Pass the interpolated vertex color on to the fragment shader */\n" " frag_color = color_attrib;\n" "\n" - " if (fog_enabled)\n" - " {\n" - " /* Estimate the distance from the eye using just the\n" - " z-coordinate to use as the fog coord */\n" - " vec4 eye_coord = modelview_matrix * vertex_attrib;\n" - " float fog_coord = abs (eye_coord.z / eye_coord.w);\n" + ; +const char cogl_fixed_vertex_shader_fog_start[] = "\n" - " /* Calculate the fog amount per-vertex and interpolate it for\n" - " the fragment shader */\n" - " if (fog_mode == GL_EXP)\n" - " fog_amount = exp (-fog_density * fog_coord);\n" - " else if (fog_mode == GL_EXP2)\n" - " fog_amount = exp (-fog_density * fog_coord\n" - " * fog_density * fog_coord);\n" - " else\n" - " fog_amount = (fog_end - fog_coord) / (fog_end - fog_start);\n" + " /* Estimate the distance from the eye using just the z-coordinate to\n" + " use as the fog coord */\n" + " vec4 eye_coord = modelview_matrix * vertex_attrib;\n" + " float fog_coord = abs (eye_coord.z / eye_coord.w);\n" "\n" - " fog_amount = clamp (fog_amount, 0.0, 1.0);\n" - " }\n" + " /* Calculate the fog amount per-vertex and interpolate it for the\n" + " fragment shader */\n" + "\n" + ; +const char cogl_fixed_vertex_shader_fog_exp[] = + " fog_amount = exp (-fog_density * fog_coord);\n" + ; +const char cogl_fixed_vertex_shader_fog_exp2[] = + " fog_amount = exp (-fog_density * fog_coord\n" + " * fog_density * fog_coord);\n" + ; +const char cogl_fixed_vertex_shader_fog_linear[] = + " fog_amount = (fog_end - fog_coord) / (fog_end - fog_start);\n" + "\n" + ; +const char cogl_fixed_vertex_shader_fog_end[] = + " fog_amount = clamp (fog_amount, 0.0, 1.0);\n" + "\n" + ; +const char cogl_fixed_vertex_shader_end[] = "}\n" ; diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-fixed-vertex-shader.glsl clutter-0.7.4/clutter/cogl/gles/cogl-fixed-vertex-shader.glsl --- clutter-0.7.2/clutter/cogl/gles/cogl-fixed-vertex-shader.glsl 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-fixed-vertex-shader.glsl 2008-06-25 17:25:14.000000000 +0100 @@ -1,3 +1,5 @@ +/*** cogl_fixed_vertex_shader_start ***/ + /* Per vertex attributes */ attribute vec4 vertex_attrib; attribute vec4 tex_coord_attrib; @@ -14,17 +16,10 @@ varying float fog_amount; /* Fogging options */ -uniform bool fog_enabled; -uniform int fog_mode; uniform float fog_density; uniform float fog_start; uniform float fog_end; -/* Fogging modes */ -const int GL_LINEAR = 0x2601; -const int GL_EXP = 0x0800; -const int GL_EXP2 = 0x0801; - void main (void) { @@ -38,23 +33,26 @@ /* Pass the interpolated vertex color on to the fragment shader */ frag_color = color_attrib; - if (fog_enabled) - { - /* Estimate the distance from the eye using just the - z-coordinate to use as the fog coord */ - vec4 eye_coord = modelview_matrix * vertex_attrib; - float fog_coord = abs (eye_coord.z / eye_coord.w); + /*** cogl_fixed_vertex_shader_fog_start ***/ - /* Calculate the fog amount per-vertex and interpolate it for - the fragment shader */ - if (fog_mode == GL_EXP) - fog_amount = exp (-fog_density * fog_coord); - else if (fog_mode == GL_EXP2) - fog_amount = exp (-fog_density * fog_coord - * fog_density * fog_coord); - else - fog_amount = (fog_end - fog_coord) / (fog_end - fog_start); + /* Estimate the distance from the eye using just the z-coordinate to + use as the fog coord */ + vec4 eye_coord = modelview_matrix * vertex_attrib; + float fog_coord = abs (eye_coord.z / eye_coord.w); - fog_amount = clamp (fog_amount, 0.0, 1.0); - } + /* Calculate the fog amount per-vertex and interpolate it for the + fragment shader */ + + /*** cogl_fixed_vertex_shader_fog_exp ***/ + fog_amount = exp (-fog_density * fog_coord); + /*** cogl_fixed_vertex_shader_fog_exp2 ***/ + fog_amount = exp (-fog_density * fog_coord + * fog_density * fog_coord); + /*** cogl_fixed_vertex_shader_fog_linear ***/ + fog_amount = (fog_end - fog_coord) / (fog_end - fog_start); + + /*** cogl_fixed_vertex_shader_fog_end ***/ + fog_amount = clamp (fog_amount, 0.0, 1.0); + + /*** cogl_fixed_vertex_shader_end ***/ } diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-fixed-vertex-shader.h clutter-0.7.4/clutter/cogl/gles/cogl-fixed-vertex-shader.h --- clutter-0.7.2/clutter/cogl/gles/cogl-fixed-vertex-shader.h 2008-06-13 12:30:23.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-fixed-vertex-shader.h 2008-06-25 17:53:39.000000000 +0100 @@ -26,6 +26,12 @@ #ifndef __COGL_FIXED_VERTEX_SHADER_H #define __COGL_FIXED_VERTEX_SHADER_H -extern const char cogl_fixed_vertex_shader[]; +extern const char cogl_fixed_vertex_shader_start[]; +extern const char cogl_fixed_vertex_shader_fog_start[]; +extern const char cogl_fixed_vertex_shader_fog_exp[]; +extern const char cogl_fixed_vertex_shader_fog_exp2[]; +extern const char cogl_fixed_vertex_shader_fog_linear[]; +extern const char cogl_fixed_vertex_shader_fog_end[]; +extern const char cogl_fixed_vertex_shader_end[]; #endif /* __COGL_FIXED_VERTEX_SHADER_H */ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-gles2-wrapper.c clutter-0.7.4/clutter/cogl/gles/cogl-gles2-wrapper.c --- clutter-0.7.2/clutter/cogl/gles/cogl-gles2-wrapper.c 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-gles2-wrapper.c 2008-06-25 17:25:14.000000000 +0100 @@ -36,6 +36,8 @@ #include "cogl-fixed-vertex-shader.h" #include "cogl-fixed-fragment-shader.h" #include "cogl-context.h" +#include "cogl-shader.h" +#include "cogl-program.h" #define _COGL_GET_GLES2_WRAPPER(wvar, retval) \ CoglGles2Wrapper *wvar; \ @@ -45,6 +47,24 @@ wvar = &__ctxvar->gles2; \ } +#define _COGL_GLES2_CHANGE_SETTING(w, var, val) \ + do \ + if ((w)->settings.var != (val)) \ + { \ + (w)->settings.var = (val); \ + (w)->settings_dirty = TRUE; \ + } \ + while (0) + +#define _COGL_GLES2_CHANGE_UNIFORM(w, flag, var, val) \ + do \ + if ((w)->var != (val)) \ + { \ + (w)->var = (val); \ + (w)->dirty_uniforms |= COGL_GLES2_DIRTY_ ## flag; \ + } \ + while (0) + #define COGL_GLES2_WRAPPER_VERTEX_ATTRIB 0 #define COGL_GLES2_WRAPPER_TEX_COORD_ATTRIB 1 #define COGL_GLES2_WRAPPER_COLOR_ATTRIB 2 @@ -83,83 +103,316 @@ void cogl_gles2_wrapper_init (CoglGles2Wrapper *wrapper) { - GLint status; GLfixed default_fog_color[4] = { 0, 0, 0, 0 }; memset (wrapper, 0, sizeof (CoglGles2Wrapper)); - /* Create the shader program */ - wrapper->vertex_shader - = cogl_gles2_wrapper_create_shader (GL_VERTEX_SHADER, - cogl_fixed_vertex_shader); + /* Initialize the stacks */ + cogl_wrap_glMatrixMode (GL_TEXTURE); + cogl_wrap_glLoadIdentity (); + cogl_wrap_glMatrixMode (GL_PROJECTION); + cogl_wrap_glLoadIdentity (); + cogl_wrap_glMatrixMode (GL_MODELVIEW); + cogl_wrap_glLoadIdentity (); - if (wrapper->vertex_shader == 0) - return; + /* Initialize the fogging options */ + cogl_wrap_glDisable (GL_FOG); + cogl_wrap_glFogx (GL_FOG_MODE, GL_LINEAR); + cogl_wrap_glFogx (GL_FOG_DENSITY, CFX_ONE); + cogl_wrap_glFogx (GL_FOG_START, 0); + cogl_wrap_glFogx (GL_FOG_END, 1); + cogl_wrap_glFogxv (GL_FOG_COLOR, default_fog_color); - wrapper->fragment_shader - = cogl_gles2_wrapper_create_shader (GL_FRAGMENT_SHADER, - cogl_fixed_fragment_shader); + /* Initialize alpha testing */ + cogl_wrap_glDisable (GL_ALPHA_TEST); + cogl_wrap_glAlphaFunc (GL_ALWAYS, 0.0f); +} - if (wrapper->fragment_shader == 0) +static gboolean +cogl_gles2_settings_equal (const CoglGles2WrapperSettings *a, + const CoglGles2WrapperSettings *b, + gboolean vertex_tests, + gboolean fragment_tests) +{ + if (fragment_tests) { - glDeleteShader (wrapper->vertex_shader); - return; + if (a->texture_2d_enabled != b->texture_2d_enabled) + return FALSE; + + if (a->texture_2d_enabled && a->alpha_only != b->alpha_only) + return FALSE; + + if (a->alpha_test_enabled != b->alpha_test_enabled) + return FALSE; + if (a->alpha_test_enabled && a->alpha_test_func != b->alpha_test_func) + return FALSE; } - wrapper->program = glCreateProgram (); - glAttachShader (wrapper->program, wrapper->fragment_shader); - glAttachShader (wrapper->program, wrapper->vertex_shader); - cogl_gles2_wrapper_bind_attributes (wrapper->program); - glLinkProgram (wrapper->program); + if (a->fog_enabled != b->fog_enabled) + return FALSE; - glGetProgramiv (wrapper->program, GL_LINK_STATUS, &status); + if (vertex_tests && a->fog_enabled && a->fog_mode != b->fog_mode) + return FALSE; - if (!status) + return TRUE; +} + +static CoglGles2WrapperShader * +cogl_gles2_get_vertex_shader (const CoglGles2WrapperSettings *settings) +{ + GString *shader_source; + GLuint shader_obj; + CoglGles2WrapperShader *shader; + GSList *node; + + _COGL_GET_GLES2_WRAPPER (w, NULL); + + /* Check if we already have a vertex shader for these settings */ + for (node = w->compiled_vertex_shaders; node; node = node->next) + if (cogl_gles2_settings_equal (settings, + &((CoglGles2WrapperShader *) + node->data)->settings, + TRUE, FALSE)) + return (CoglGles2WrapperShader *) node->data; + + /* Otherwise create a new shader */ + shader_source = g_string_new (cogl_fixed_vertex_shader_start); + + if (settings->fog_enabled) { - char log[1024]; - GLint len; + g_string_append (shader_source, cogl_fixed_vertex_shader_fog_start); - glGetProgramInfoLog (wrapper->program, sizeof (log) - 1, &len, log); - log[len] = '\0'; + switch (settings->fog_mode) + { + case GL_EXP: + g_string_append (shader_source, cogl_fixed_vertex_shader_fog_exp); + break; - g_critical ("%s", log); + case GL_EXP2: + g_string_append (shader_source, cogl_fixed_vertex_shader_fog_exp2); + break; - glDeleteProgram (wrapper->program); - glDeleteShader (wrapper->vertex_shader); - glDeleteShader (wrapper->fragment_shader); + default: + g_string_append (shader_source, cogl_fixed_vertex_shader_fog_linear); + break; + } - return; + g_string_append (shader_source, cogl_fixed_vertex_shader_fog_end); } - glUseProgram (wrapper->program); + g_string_append (shader_source, cogl_fixed_vertex_shader_end); - wrapper->uniforms = &wrapper->fixed_uniforms; - cogl_gles2_wrapper_get_uniforms (wrapper->program, wrapper->uniforms); + shader_obj = cogl_gles2_wrapper_create_shader (GL_VERTEX_SHADER, + shader_source->str); - /* Always use the first texture unit */ - glUniform1i (wrapper->uniforms->bound_texture_uniform, 0); + g_string_free (shader_source, TRUE); + + if (shader_obj == 0) + return NULL; + + shader = g_slice_new (CoglGles2WrapperShader); + shader->shader = shader_obj; + shader->settings = *settings; - /* Initialize the stacks */ - cogl_wrap_glMatrixMode (GL_TEXTURE); - cogl_wrap_glLoadIdentity (); - cogl_wrap_glMatrixMode (GL_PROJECTION); - cogl_wrap_glLoadIdentity (); - cogl_wrap_glMatrixMode (GL_MODELVIEW); - cogl_wrap_glLoadIdentity (); + w->compiled_vertex_shaders = g_slist_prepend (w->compiled_vertex_shaders, + shader); - wrapper->mvp_uptodate = GL_FALSE; + return shader; +} - /* Initialize the fogging options */ - cogl_wrap_glDisable (GL_FOG); - cogl_wrap_glFogx (GL_FOG_MODE, GL_LINEAR); - cogl_wrap_glFogx (GL_FOG_DENSITY, CFX_ONE); - cogl_wrap_glFogx (GL_FOG_START, 0); - cogl_wrap_glFogx (GL_FOG_END, 1); - cogl_wrap_glFogxv (GL_FOG_COLOR, default_fog_color); +static CoglGles2WrapperShader * +cogl_gles2_get_fragment_shader (const CoglGles2WrapperSettings *settings) +{ + GString *shader_source; + GLuint shader_obj; + CoglGles2WrapperShader *shader; + GSList *node; - /* Initialize alpha testing */ - cogl_wrap_glDisable (GL_ALPHA_TEST); - cogl_wrap_glAlphaFunc (GL_ALWAYS, 0.0f); + _COGL_GET_GLES2_WRAPPER (w, NULL); + + /* Check if we already have a fragment shader for these settings */ + for (node = w->compiled_fragment_shaders; node; node = node->next) + if (cogl_gles2_settings_equal (settings, + &((CoglGles2WrapperShader *) + node->data)->settings, + FALSE, TRUE)) + return (CoglGles2WrapperShader *) node->data; + + /* Otherwise create a new shader */ + shader_source = g_string_new (cogl_fixed_fragment_shader_start); + if (settings->texture_2d_enabled) + { + if (settings->alpha_only) + g_string_append (shader_source, + cogl_fixed_fragment_shader_texture_alpha_only); + else + g_string_append (shader_source, + cogl_fixed_fragment_shader_texture); + } + else + g_string_append (shader_source, cogl_fixed_fragment_shader_solid_color); + + if (settings->fog_enabled) + g_string_append (shader_source, cogl_fixed_fragment_shader_fog); + + if (settings->alpha_test_enabled) + switch (settings->alpha_test_func) + { + case GL_NEVER: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_never); + break; + case GL_LESS: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_less); + break; + case GL_EQUAL: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_equal); + break; + case GL_LEQUAL: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_lequal); + break; + case GL_GREATER: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_greater); + break; + case GL_NOTEQUAL: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_notequal); + break; + case GL_GEQUAL: + g_string_append (shader_source, + cogl_fixed_fragment_shader_alpha_gequal); + } + + g_string_append (shader_source, cogl_fixed_fragment_shader_end); + + shader_obj = cogl_gles2_wrapper_create_shader (GL_FRAGMENT_SHADER, + shader_source->str); + + g_string_free (shader_source, TRUE); + + if (shader_obj == 0) + return NULL; + + shader = g_slice_new (CoglGles2WrapperShader); + shader->shader = shader_obj; + shader->settings = *settings; + + w->compiled_fragment_shaders = g_slist_prepend (w->compiled_fragment_shaders, + shader); + + return shader; +} + +static CoglGles2WrapperProgram * +cogl_gles2_wrapper_get_program (const CoglGles2WrapperSettings *settings) +{ + GSList *node; + CoglGles2WrapperProgram *program; + CoglGles2WrapperShader *vertex_shader, *fragment_shader; + GLint status; + gboolean custom_vertex_shader = FALSE, custom_fragment_shader = FALSE; + CoglProgram *user_program = NULL; + int i; + + _COGL_GET_GLES2_WRAPPER (w, NULL); + + /* Check if we've already got a program for these settings */ + for (node = w->compiled_programs; node; node = node->next) + { + program = (CoglGles2WrapperProgram *) node->data; + + if (cogl_gles2_settings_equal (settings, &program->settings, TRUE, TRUE) + && program->settings.user_program == settings->user_program) + return (CoglGles2WrapperProgram *) node->data; + } + + /* Otherwise create a new program */ + + /* Check whether the currently used custom program has vertex and + fragment shaders */ + if (w->settings.user_program != COGL_INVALID_HANDLE) + { + user_program + = _cogl_program_pointer_from_handle (w->settings.user_program); + + for (node = user_program->attached_shaders; node; node = node->next) + { + CoglShader *shader + = _cogl_shader_pointer_from_handle ((CoglHandle) node->data); + + if (shader->type == CGL_VERTEX_SHADER) + custom_vertex_shader = TRUE; + else if (shader->type == CGL_FRAGMENT_SHADER) + custom_fragment_shader = TRUE; + } + } + + /* Get or create the fixed functionality shaders for these settings + if there is no custom replacement */ + if (!custom_vertex_shader) + { + vertex_shader = cogl_gles2_get_vertex_shader (settings); + if (vertex_shader == NULL) + return NULL; + } + if (!custom_fragment_shader) + { + fragment_shader = cogl_gles2_get_fragment_shader (settings); + if (fragment_shader == NULL) + return NULL; + } + + program = g_slice_new (CoglGles2WrapperProgram); + + program->program = glCreateProgram (); + if (!custom_vertex_shader) + glAttachShader (program->program, vertex_shader->shader); + if (!custom_fragment_shader) + glAttachShader (program->program, fragment_shader->shader); + if (user_program) + for (node = user_program->attached_shaders; node; node = node->next) + { + CoglShader *shader + = _cogl_shader_pointer_from_handle ((CoglHandle) node->data); + glAttachShader (program->program, shader->gl_handle); + } + cogl_gles2_wrapper_bind_attributes (program->program); + glLinkProgram (program->program); + + glGetProgramiv (program->program, GL_LINK_STATUS, &status); + + if (!status) + { + char log[1024]; + GLint len; + + glGetProgramInfoLog (program->program, sizeof (log) - 1, &len, log); + log[len] = '\0'; + + g_critical ("%s", log); + + glDeleteProgram (program->program); + g_slice_free (CoglGles2WrapperProgram, program); + + return NULL; + } + + program->settings = *settings; + + cogl_gles2_wrapper_get_uniforms (program->program, &program->uniforms); + + /* We haven't tried to get a location for any of the custom uniforms + yet */ + for (i = 0; i < COGL_GLES2_NUM_CUSTOM_UNIFORMS; i++) + program->custom_uniforms[i] = COGL_GLES2_UNBOUND_CUSTOM_UNIFORM; + + w->compiled_programs = g_slist_append (w->compiled_programs, program); + + return program; } void @@ -183,17 +436,9 @@ = glGetUniformLocation (program, "modelview_matrix"); uniforms->texture_matrix_uniform = glGetUniformLocation (program, "texture_matrix"); - uniforms->texture_2d_enabled_uniform - = glGetUniformLocation (program, "texture_2d_enabled"); uniforms->bound_texture_uniform = glGetUniformLocation (program, "texture_unit"); - uniforms->alpha_only_uniform - = glGetUniformLocation (program, "alpha_only"); - uniforms->fog_enabled_uniform - = glGetUniformLocation (program, "fog_enabled"); - uniforms->fog_mode_uniform - = glGetUniformLocation (program, "fog_mode"); uniforms->fog_density_uniform = glGetUniformLocation (program, "fog_density"); uniforms->fog_start_uniform @@ -203,10 +448,6 @@ uniforms->fog_color_uniform = glGetUniformLocation (program, "fog_color"); - uniforms->alpha_test_enabled_uniform - = glGetUniformLocation (program, "alpha_test_enabled"); - uniforms->alpha_test_func_uniform - = glGetUniformLocation (program, "alpha_test_func"); uniforms->alpha_test_ref_uniform = glGetUniformLocation (program, "alpha_test_ref"); } @@ -214,42 +455,50 @@ void cogl_gles2_wrapper_deinit (CoglGles2Wrapper *wrapper) { - if (wrapper->program) + GSList *node, *next; + + for (node = wrapper->compiled_programs; node; node = next) { - glDeleteProgram (wrapper->program); - wrapper->program = 0; + next = node->next; + glDeleteProgram (((CoglGles2WrapperProgram *) node->data)->program); + g_slist_free1 (node); } - if (wrapper->vertex_shader) + wrapper->compiled_programs = NULL; + + for (node = wrapper->compiled_vertex_shaders; node; node = next) { - glDeleteShader (wrapper->vertex_shader); - wrapper->vertex_shader = 0; + next = node->next; + glDeleteShader (((CoglGles2WrapperShader *) node->data)->shader); + g_slist_free1 (node); } - if (wrapper->fragment_shader) + wrapper->compiled_vertex_shaders = NULL; + + for (node = wrapper->compiled_fragment_shaders; node; node = next) { - glDeleteShader (wrapper->fragment_shader); - wrapper->fragment_shader = 0; + next = node->next; + glDeleteShader (((CoglGles2WrapperShader *) node->data)->shader); + g_slist_free1 (node); } + wrapper->compiled_fragment_shaders = NULL; } void cogl_gles2_wrapper_update_matrix (CoglGles2Wrapper *wrapper, GLenum matrix_num) { - const float *matrix; - switch (matrix_num) { default: case GL_MODELVIEW: + wrapper->dirty_uniforms |= COGL_GLES2_DIRTY_MVP_MATRIX + | COGL_GLES2_DIRTY_MODELVIEW_MATRIX; + break; + case GL_PROJECTION: - /* Queue a recalculation of the combined modelview and - projection matrix at the next draw */ - wrapper->mvp_uptodate = GL_FALSE; + wrapper->dirty_uniforms |= COGL_GLES2_DIRTY_MVP_MATRIX; break; case GL_TEXTURE: - matrix = wrapper->texture_stack + wrapper->texture_stack_pos * 16; - glUniformMatrix4fv (wrapper->uniforms->texture_matrix_uniform, - 1, GL_FALSE, matrix); + wrapper->dirty_uniforms |= COGL_GLES2_DIRTY_TEXTURE_MATRIX; break; } } @@ -530,26 +779,105 @@ void cogl_wrap_glDrawArrays (GLenum mode, GLint first, GLsizei count) { + CoglGles2WrapperProgram *program; + _COGL_GET_GLES2_WRAPPER (w, NO_RETVAL); - /* Make sure the modelview+projection matrix is up to date */ - if (!w->mvp_uptodate) + /* Check if we need to switch programs */ + if (w->settings_dirty) { - float mvp_matrix[16]; - const float *modelview_matrix = w->modelview_stack - + w->modelview_stack_pos * 16; + /* Find or create a program for the current settings */ + program = cogl_gles2_wrapper_get_program (&w->settings); - cogl_gles2_wrapper_mult_matrix (mvp_matrix, - w->projection_stack - + w->projection_stack_pos * 16, - modelview_matrix); + if (program == NULL) + /* Can't compile a shader so there is nothing we can do */ + return; - glUniformMatrix4fv (w->uniforms->mvp_matrix_uniform, 1, - GL_FALSE, mvp_matrix); - glUniformMatrix4fv (w->uniforms->modelview_matrix_uniform, 1, GL_FALSE, - modelview_matrix); + /* Start using it if we aren't already */ + if (w->current_program != program) + { + glUseProgram (program->program); + w->current_program = program; + /* All of the uniforms are probably now out of date */ + w->dirty_uniforms = COGL_GLES2_DIRTY_ALL; + w->dirty_custom_uniforms = (1 << COGL_GLES2_NUM_CUSTOM_UNIFORMS) - 1; + } + w->settings_dirty = FALSE; + } + else + program = w->current_program; - w->mvp_uptodate = GL_TRUE; + /* Make sure all of the uniforms are up to date */ + if (w->dirty_uniforms) + { + if ((w->dirty_uniforms & (COGL_GLES2_DIRTY_MVP_MATRIX + | COGL_GLES2_DIRTY_MODELVIEW_MATRIX))) + { + float mvp_matrix[16]; + const float *modelview_matrix = w->modelview_stack + + w->modelview_stack_pos * 16; + + cogl_gles2_wrapper_mult_matrix (mvp_matrix, + w->projection_stack + + w->projection_stack_pos * 16, + modelview_matrix); + + if (program->uniforms.mvp_matrix_uniform != -1) + glUniformMatrix4fv (program->uniforms.mvp_matrix_uniform, 1, + GL_FALSE, mvp_matrix); + if (program->uniforms.modelview_matrix_uniform != -1) + glUniformMatrix4fv (program->uniforms.modelview_matrix_uniform, 1, + GL_FALSE, modelview_matrix); + } + if ((w->dirty_uniforms & COGL_GLES2_DIRTY_TEXTURE_MATRIX) + && program->uniforms.texture_matrix_uniform != -1) + glUniformMatrix4fv (program->uniforms.texture_matrix_uniform, 1, + GL_FALSE, + w->texture_stack + w->texture_stack_pos * 16); + + if ((w->dirty_uniforms & COGL_GLES2_DIRTY_FOG_DENSITY) + && program->uniforms.fog_density_uniform != -1) + glUniform1f (program->uniforms.fog_density_uniform, w->fog_density); + if ((w->dirty_uniforms & COGL_GLES2_DIRTY_FOG_START) + && program->uniforms.fog_start_uniform != -1) + glUniform1f (program->uniforms.fog_start_uniform, w->fog_start); + if ((w->dirty_uniforms & COGL_GLES2_DIRTY_FOG_END) + && program->uniforms.fog_end_uniform != -1) + glUniform1f (program->uniforms.fog_end_uniform, w->fog_end); + + if ((w->dirty_uniforms & COGL_GLES2_DIRTY_ALPHA_TEST_REF) + && program->uniforms.alpha_test_ref_uniform != -1) + glUniform1f (program->uniforms.alpha_test_ref_uniform, + w->alpha_test_ref); + + w->dirty_uniforms = 0; + } + + if (w->dirty_custom_uniforms) + { + int i; + + if (w->settings.user_program != COGL_INVALID_HANDLE) + { + CoglProgram *user_program + = _cogl_program_pointer_from_handle (w->settings.user_program); + const char *uniform_name; + + for (i = 0; i < COGL_GLES2_NUM_CUSTOM_UNIFORMS; i++) + if ((w->dirty_custom_uniforms & (1 << i)) + && (uniform_name = user_program->custom_uniform_names[i])) + { + if (program->custom_uniforms[i] + == COGL_GLES2_UNBOUND_CUSTOM_UNIFORM) + program->custom_uniforms[i] + = glGetUniformLocation (program->program, uniform_name); + if (program->custom_uniforms[i] >= 0) + glUniform1f (program->custom_uniforms[i], + w->custom_uniforms[i]); + } + } + + w->dirty_custom_uniforms = 0; } glDrawArrays (mode, first, count); @@ -566,8 +894,7 @@ /* We need to keep track of whether the texture is alpha-only because the emulation of GL_MODULATE needs to work differently in that case */ - glUniform1i (w->uniforms->alpha_only_uniform, - internal_format == GL_ALPHA ? GL_TRUE : GL_FALSE); + _COGL_GLES2_CHANGE_SETTING (w, alpha_only, internal_format == GL_ALPHA); } void @@ -586,15 +913,15 @@ switch (cap) { case GL_TEXTURE_2D: - glUniform1i (w->uniforms->texture_2d_enabled_uniform, GL_TRUE); + _COGL_GLES2_CHANGE_SETTING (w, texture_2d_enabled, TRUE); break; case GL_FOG: - glUniform1i (w->uniforms->fog_enabled_uniform, GL_TRUE); + _COGL_GLES2_CHANGE_SETTING (w, fog_enabled, TRUE); break; case GL_ALPHA_TEST: - glUniform1i (w->uniforms->alpha_test_enabled_uniform, GL_TRUE); + _COGL_GLES2_CHANGE_SETTING (w, alpha_test_enabled, TRUE); break; default: @@ -610,15 +937,15 @@ switch (cap) { case GL_TEXTURE_2D: - glUniform1i (w->uniforms->texture_2d_enabled_uniform, GL_FALSE); + _COGL_GLES2_CHANGE_SETTING (w, texture_2d_enabled, FALSE); break; case GL_FOG: - glUniform1i (w->uniforms->fog_enabled_uniform, GL_FALSE); + _COGL_GLES2_CHANGE_SETTING (w, fog_enabled, FALSE); break; case GL_ALPHA_TEST: - glUniform1i (w->uniforms->alpha_test_enabled_uniform, GL_FALSE); + _COGL_GLES2_CHANGE_SETTING (w, alpha_test_enabled, FALSE); break; default: @@ -670,8 +997,8 @@ else if (ref > 1.0f) ref = 1.0f; - glUniform1i (w->uniforms->alpha_test_func_uniform, func); - glUniform1f (w->uniforms->alpha_test_ref_uniform, ref); + _COGL_GLES2_CHANGE_SETTING (w, alpha_test_func, func); + _COGL_GLES2_CHANGE_UNIFORM (w, ALPHA_TEST_REF, alpha_test_ref, ref); } void @@ -753,22 +1080,22 @@ switch (pname) { case GL_FOG_MODE: - glUniform1i (w->uniforms->fog_mode_uniform, param); + _COGL_GLES2_CHANGE_SETTING (w, fog_mode, param); break; case GL_FOG_DENSITY: - glUniform1f (w->uniforms->fog_density_uniform, - CLUTTER_FIXED_TO_FLOAT (param)); + _COGL_GLES2_CHANGE_UNIFORM (w, FOG_DENSITY, fog_density, + CLUTTER_FIXED_TO_FLOAT (param)); break; case GL_FOG_START: - glUniform1f (w->uniforms->fog_start_uniform, - CLUTTER_FIXED_TO_FLOAT (param)); + _COGL_GLES2_CHANGE_UNIFORM (w, FOG_START, fog_start, + CLUTTER_FIXED_TO_FLOAT (param)); break; case GL_FOG_END: - glUniform1f (w->uniforms->fog_end_uniform, - CLUTTER_FIXED_TO_FLOAT (param)); + _COGL_GLES2_CHANGE_UNIFORM (w, FOG_END, fog_end, + CLUTTER_FIXED_TO_FLOAT (param)); break; } } @@ -776,14 +1103,15 @@ void cogl_wrap_glFogxv (GLenum pname, const GLfixed *params) { + int i; _COGL_GET_GLES2_WRAPPER (w, NO_RETVAL); if (pname == GL_FOG_COLOR) - glUniform4f (w->uniforms->fog_color_uniform, - CLUTTER_FIXED_TO_FLOAT (params[0]), - CLUTTER_FIXED_TO_FLOAT (params[1]), - CLUTTER_FIXED_TO_FLOAT (params[2]), - CLUTTER_FIXED_TO_FLOAT (params[3])); + { + for (i = 0; i < 4; i++) + w->fog_color[i] = CLUTTER_FIXED_TO_FLOAT (params[i]); + w->dirty_uniforms |= COGL_GLES2_DIRTY_FOG_COLOR; + } } void @@ -792,3 +1120,33 @@ if (pname != GL_GENERATE_MIPMAP) glTexParameteri (target, pname, param); } + +void +_cogl_gles2_clear_cache_for_program (CoglHandle user_program) +{ + GSList *node, *next, *last = NULL; + CoglGles2WrapperProgram *program; + + _COGL_GET_GLES2_WRAPPER (w, NO_RETVAL); + + /* Remove any cached programs that link against this custom program */ + for (node = w->compiled_programs; node; node = next) + { + next = node->next; + program = (CoglGles2WrapperProgram *) node->data; + + if (program->settings.user_program == user_program) + { + glDeleteProgram (program->program); + + if (last) + last->next = next; + else + w->compiled_programs = next; + + g_slist_free1 (node); + } + else + last = node; + } +} diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-gles2-wrapper.h clutter-0.7.4/clutter/cogl/gles/cogl-gles2-wrapper.h --- clutter-0.7.2/clutter/cogl/gles/cogl-gles2-wrapper.h 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-gles2-wrapper.h 2008-06-25 17:25:14.000000000 +0100 @@ -32,39 +32,64 @@ typedef struct _CoglGles2Wrapper CoglGles2Wrapper; typedef struct _CoglGles2WrapperUniforms CoglGles2WrapperUniforms; +typedef struct _CoglGles2WrapperSettings CoglGles2WrapperSettings; +typedef struct _CoglGles2WrapperProgram CoglGles2WrapperProgram; +typedef struct _CoglGles2WrapperShader CoglGles2WrapperShader; + +#define COGL_GLES2_NUM_CUSTOM_UNIFORMS 16 +#define COGL_GLES2_UNBOUND_CUSTOM_UNIFORM -2 /* Must be a power of two */ -#define COGL_GLES2_MODELVIEW_STACK_SIZE 32 -#define COGL_GLES2_PROJECTION_STACK_SIZE 2 -#define COGL_GLES2_TEXTURE_STACK_SIZE 2 +#define COGL_GLES2_MODELVIEW_STACK_SIZE 32 +#define COGL_GLES2_PROJECTION_STACK_SIZE 2 +#define COGL_GLES2_TEXTURE_STACK_SIZE 2 + +enum + { + COGL_GLES2_DIRTY_MVP_MATRIX = 1 << 0, + COGL_GLES2_DIRTY_MODELVIEW_MATRIX = 1 << 1, + COGL_GLES2_DIRTY_TEXTURE_MATRIX = 1 << 2, + COGL_GLES2_DIRTY_FOG_DENSITY = 1 << 3, + COGL_GLES2_DIRTY_FOG_START = 1 << 4, + COGL_GLES2_DIRTY_FOG_END = 1 << 5, + COGL_GLES2_DIRTY_FOG_COLOR = 1 << 6, + COGL_GLES2_DIRTY_ALPHA_TEST_REF = 1 << 7, + + COGL_GLES2_DIRTY_ALL = (1 << 8) - 1 + }; struct _CoglGles2WrapperUniforms { GLint mvp_matrix_uniform; GLint modelview_matrix_uniform; GLint texture_matrix_uniform; - GLint texture_2d_enabled_uniform; GLint bound_texture_uniform; - GLint alpha_only_uniform; - GLint fog_enabled_uniform; - GLint fog_mode_uniform; GLint fog_density_uniform; GLint fog_start_uniform; GLint fog_end_uniform; GLint fog_color_uniform; - GLint alpha_test_enabled_uniform; - GLint alpha_test_func_uniform; GLint alpha_test_ref_uniform; }; -struct _CoglGles2Wrapper +struct _CoglGles2WrapperSettings { - GLuint program; - GLuint vertex_shader; - GLuint fragment_shader; + gboolean texture_2d_enabled; + gboolean alpha_only; + + gboolean alpha_test_enabled; + GLint alpha_test_func; + gboolean fog_enabled; + GLint fog_mode; + + /* The current in-use user program */ + CoglHandle user_program; +}; + +struct _CoglGles2Wrapper +{ GLuint matrix_mode; GLfloat modelview_stack[COGL_GLES2_MODELVIEW_STACK_SIZE * 16]; GLuint modelview_stack_pos; @@ -73,19 +98,61 @@ GLfloat texture_stack[COGL_GLES2_TEXTURE_STACK_SIZE * 16]; GLuint texture_stack_pos; - /* The uniforms for the fixed-functionality emulation program */ - CoglGles2WrapperUniforms fixed_uniforms; - /* The uniforms for the currently bound program */ - CoglGles2WrapperUniforms *uniforms; - /* The combined modelview and projection matrix is only updated at the last minute in glDrawArrays to avoid recalculating it for every change to the modelview matrix */ GLboolean mvp_uptodate; + + /* The currently bound program */ + CoglGles2WrapperProgram *current_program; + + /* The current settings */ + CoglGles2WrapperSettings settings; + /* Whether the settings have changed since the last draw */ + gboolean settings_dirty; + /* Uniforms that have changed since the last draw */ + int dirty_uniforms, dirty_custom_uniforms; + + /* List of all compiled program combinations */ + GSList *compiled_programs; + + /* List of all compiled vertex shaders */ + GSList *compiled_vertex_shaders; + + /* List of all compiled fragment shaders */ + GSList *compiled_fragment_shaders; + + /* Values for the uniforms */ + GLfloat alpha_test_ref; + GLfloat fog_density; + GLfloat fog_start; + GLfloat fog_end; + GLfloat fog_color[4]; + GLfloat custom_uniforms[COGL_GLES2_NUM_CUSTOM_UNIFORMS]; +}; + +struct _CoglGles2WrapperProgram +{ + GLuint program; + + /* The settings that were used to generate this combination */ + CoglGles2WrapperSettings settings; + + /* The uniforms for this program */ + CoglGles2WrapperUniforms uniforms; + GLint custom_uniforms[COGL_GLES2_NUM_CUSTOM_UNIFORMS]; +}; + +struct _CoglGles2WrapperShader +{ + GLuint shader; + + /* The settings that were used to generate this shader */ + CoglGles2WrapperSettings settings; }; /* These defines are missing from GL ES 2 but we can still use them - with the wrapper funcions */ + with the wrapper functions */ #ifndef GL_MODELVIEW @@ -122,6 +189,9 @@ #define GL_TEXTURE_ENV_MODE 0x2200 #define GL_MODULATE 0x2100 +#define GL_EXP 0x8000 +#define GL_EXP2 0x8001 + #endif /* GL_MODELVIEW */ void cogl_gles2_wrapper_init (CoglGles2Wrapper *wrapper); @@ -184,6 +254,8 @@ void cogl_gles2_wrapper_update_matrix (CoglGles2Wrapper *wrapper, GLenum matrix_num); +void _cogl_gles2_clear_cache_for_program (CoglHandle program); + #else /* HAVE_COGL_GLES2 */ /* If we're not using GL ES 2 then just use the GL functions diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-program.c clutter-0.7.4/clutter/cogl/gles/cogl-program.c --- clutter-0.7.2/clutter/cogl/gles/cogl-program.c 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-program.c 2008-06-25 17:25:14.000000000 +0100 @@ -35,6 +35,8 @@ #ifdef HAVE_COGL_GLES2 +#include + #include "cogl-shader.h" #include "cogl-program.h" @@ -45,26 +47,38 @@ static void _cogl_program_free (CoglProgram *program) { - /* Frees program resources but its handle is not - released! Do that separately before this! */ + int i; + _COGL_GET_CONTEXT (ctx, NO_RETVAL); - glDeleteProgram (program->gl_handle); + + /* Unref all of the attached shaders */ + g_slist_foreach (program->attached_shaders, (GFunc) cogl_shader_unref, NULL); + /* Destroy the list */ + g_slist_free (program->attached_shaders); + + _cogl_gles2_clear_cache_for_program ((CoglHandle) program); + + if (ctx->gles2.settings.user_program == (CoglHandle) program) + { + ctx->gles2.settings.user_program = COGL_INVALID_HANDLE; + ctx->gles2.settings_dirty = TRUE; + } + + for (i = 0; i < COGL_GLES2_NUM_CUSTOM_UNIFORMS; i++) + if (program->custom_uniform_names[i]) + g_free (program->custom_uniform_names[i]); } CoglHandle cogl_create_program (void) { CoglProgram *program; - _COGL_GET_CONTEXT (ctx, 0); program = g_slice_new (CoglProgram); program->ref_count = 1; - program->gl_handle = glCreateProgram (); - - program->attached_vertex_shader = FALSE; - program->attached_fragment_shader = FALSE; - program->attached_fixed_vertex_shader = FALSE; - program->attached_fixed_fragment_shader = FALSE; + program->attached_shaders = NULL; + memset (program->custom_uniform_names, 0, + COGL_GLES2_NUM_CUSTOM_UNIFORMS * sizeof (char *)); COGL_HANDLE_DEBUG_NEW (program, program); @@ -76,7 +90,6 @@ CoglHandle shader_handle) { CoglProgram *program; - CoglShader *shader; _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -84,110 +97,66 @@ return; program = _cogl_program_pointer_from_handle (program_handle); - shader = _cogl_shader_pointer_from_handle (shader_handle); - - if (shader->type == GL_VERTEX_SHADER) - { - if (program->attached_fixed_vertex_shader) - { - glDetachShader (program->gl_handle, ctx->gles2.vertex_shader); - program->attached_fixed_vertex_shader = FALSE; - } - program->attached_vertex_shader = TRUE; - } - else if (shader->type == GL_FRAGMENT_SHADER) - { - if (program->attached_fixed_fragment_shader) - { - glDetachShader (program->gl_handle, ctx->gles2.fragment_shader); - program->attached_fixed_fragment_shader = FALSE; - } - program->attached_fragment_shader = TRUE; - } + program->attached_shaders + = g_slist_prepend (program->attached_shaders, + cogl_shader_ref (shader_handle)); - glAttachShader (program->gl_handle, shader->gl_handle); + /* Whenever the shader changes we will need to relink the program + with the fixed functionality shaders so we should forget the + cached programs */ + _cogl_gles2_clear_cache_for_program (program); } void cogl_program_link (CoglHandle handle) { - CoglProgram *program; - _COGL_GET_CONTEXT (ctx, NO_RETVAL); - - if (!cogl_is_program (handle)) - return; - - program = _cogl_program_pointer_from_handle (handle); - - if (!program->attached_vertex_shader - && !program->attached_fixed_vertex_shader) - { - glAttachShader (program->gl_handle, ctx->gles2.vertex_shader); - program->attached_fixed_vertex_shader = TRUE; - } - - if (!program->attached_fragment_shader - && !program->attached_fixed_fragment_shader) - { - glAttachShader (program->gl_handle, ctx->gles2.fragment_shader); - program->attached_fixed_fragment_shader = TRUE; - } - - /* Set the attributes so that the wrapper functions will still work */ - cogl_gles2_wrapper_bind_attributes (program->gl_handle); - - glLinkProgram (program->gl_handle); - - /* Retrieve the uniforms */ - cogl_gles2_wrapper_get_uniforms (program->gl_handle, - &program->uniforms); + /* There's no point in linking the program here because it will have + to be relinked with a different fixed functionality shader + whenever the settings change */ } void cogl_program_use (CoglHandle handle) { - CoglProgram *program; - GLuint gl_handle; _COGL_GET_CONTEXT (ctx, NO_RETVAL); if (handle != COGL_INVALID_HANDLE && !cogl_is_program (handle)) return; - if (handle == COGL_INVALID_HANDLE) - { - /* Go back to the fixed-functionality emulator program */ - gl_handle = ctx->gles2.program; - ctx->gles2.uniforms = &ctx->gles2.fixed_uniforms; - } - else - { - program = _cogl_program_pointer_from_handle (handle); - gl_handle = program->gl_handle; - /* Use the uniforms in the program */ - ctx->gles2.uniforms = &program->uniforms; - } - - glUseProgram (gl_handle); - - /* Update all of the matrix attributes */ - cogl_gles2_wrapper_update_matrix (&ctx->gles2, GL_MODELVIEW); - cogl_gles2_wrapper_update_matrix (&ctx->gles2, GL_PROJECTION); - cogl_gles2_wrapper_update_matrix (&ctx->gles2, GL_TEXTURE); + ctx->gles2.settings.user_program = handle; + ctx->gles2.settings_dirty = TRUE; } COGLint cogl_program_get_uniform_location (CoglHandle handle, const gchar *uniform_name) { + int i; CoglProgram *program; - _COGL_GET_CONTEXT (ctx, 0); - + if (!cogl_is_program (handle)) - return 0; + return -1; program = _cogl_program_pointer_from_handle (handle); - return glGetUniformLocation (program->gl_handle, uniform_name); + /* We can't just ask the GL program object for the uniform location + directly because it will change every time the program is linked + with a new fixed functionality shader. Instead we make our own + mapping of uniform numbers and cache the names */ + for (i = 0; program->custom_uniform_names[i] + && i < COGL_GLES2_NUM_CUSTOM_UNIFORMS; i++) + if (!strcmp (program->custom_uniform_names[i], uniform_name)) + return i; + + if (i < COGL_GLES2_NUM_CUSTOM_UNIFORMS) + { + program->custom_uniform_names[i] = g_strdup (uniform_name); + return i; + } + else + /* We've run out of space for new uniform names so just pretend it + isn't there */ + return -1; } void @@ -195,7 +164,12 @@ gfloat value) { _COGL_GET_CONTEXT (ctx, NO_RETVAL); - glUniform1f (uniform_no, value); + + if (uniform_no >= 0 && uniform_no < COGL_GLES2_NUM_CUSTOM_UNIFORMS) + { + ctx->gles2.custom_uniforms[uniform_no] = value; + ctx->gles2.dirty_custom_uniforms |= 1 << uniform_no; + } } #else /* HAVE_COGL_GLES2 */ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/cogl-program.h clutter-0.7.4/clutter/cogl/gles/cogl-program.h --- clutter-0.7.2/clutter/cogl/gles/cogl-program.h 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/cogl-program.h 2008-06-25 17:25:14.000000000 +0100 @@ -33,16 +33,10 @@ struct _CoglProgram { guint ref_count; - GLuint gl_handle; - /* Keep track of which types of shader we've attached so we can link - in our replacement fixed functionality shader */ - gboolean attached_vertex_shader; - gboolean attached_fragment_shader; - gboolean attached_fixed_vertex_shader; - gboolean attached_fixed_fragment_shader; + GSList *attached_shaders; - CoglGles2WrapperUniforms uniforms; + char *custom_uniform_names[COGL_GLES2_NUM_CUSTOM_UNIFORMS]; }; CoglProgram *_cogl_program_pointer_from_handle (CoglHandle handle); diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/cogl/gles/stringify.sh clutter-0.7.4/clutter/cogl/gles/stringify.sh --- clutter-0.7.2/clutter/cogl/gles/stringify.sh 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/cogl/gles/stringify.sh 2008-06-25 17:25:14.000000000 +0100 @@ -44,7 +44,11 @@ echo "#ifndef ${guardname}" >> "${headername}"; echo "#define ${guardname}" >> "${headername}"; echo >> "${headername}"; - echo "extern const char ${varname}[];" >> "${headername}"; + + sed -n \ + -e 's/^ *\/\*\*\* \([a-zA-Z0-9_]*\) \*\*\*\//extern const char \1[];/p' \ + < "$2" >> "${headername}"; + echo >> "${headername}"; echo "#endif /* ${guardname} */" >> "${headername}"; @@ -57,9 +61,16 @@ output_copyright "${cname}"; echo >> "${cname}"; - echo "const char ${varname}[] =" >> "${cname}"; - sed -e 's/"/\\"/' -e 's/^/ \"/' -e 's/$/\\n"/' \ + sed -n \ + -e h \ + -e 's/^ *\/\*\*\* \([a-zA-Z0-9_]*\) \*\*\*\// ;\nconst char \1[] =/' \ + -e 't got' \ + -e g \ + -e 's/"/\\"/' \ + -e 's/^/ "/' \ + -e 's/$/\\n"/' \ + -e ': got' \ + -e p \ < "$1" >> "${cname}"; echo " ;" >> "${cname}"; - fi; diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/eglnative/clutter-backend-egl.c clutter-0.7.4/clutter/eglnative/clutter-backend-egl.c --- clutter-0.7.2/clutter/eglnative/clutter-backend-egl.c 2008-06-10 13:20:20.000000000 +0100 +++ clutter-0.7.4/clutter/eglnative/clutter-backend-egl.c 2008-06-25 17:25:13.000000000 +0100 @@ -198,6 +198,33 @@ } static void +clutter_backend_egl_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend); + gint surface_width, surface_height; + + if (backend_egl->stage) + { + ClutterStageEGL *stage_egl; + + stage_egl = CLUTTER_STAGE_EGL (backend_egl->stage); + + surface_width = stage_egl->surface_width; + surface_height = stage_egl->surface_height; + } + else + surface_width = surface_height = 0; + + if (width) + *width = surface_width; + + if (height) + *height = surface_height; +} + +static void clutter_backend_egl_class_init (ClutterBackendEGLClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -207,13 +234,14 @@ gobject_class->dispose = clutter_backend_egl_dispose; gobject_class->finalize = clutter_backend_egl_finalize; - backend_class->pre_parse = clutter_backend_egl_pre_parse; - backend_class->post_parse = clutter_backend_egl_post_parse; - backend_class->init_events = clutter_backend_egl_init_events; - backend_class->create_stage = clutter_backend_egl_create_stage; - backend_class->ensure_context = clutter_backend_egl_ensure_context; - backend_class->redraw = clutter_backend_egl_redraw; - backend_class->get_features = clutter_backend_egl_get_features; + backend_class->pre_parse = clutter_backend_egl_pre_parse; + backend_class->post_parse = clutter_backend_egl_post_parse; + backend_class->init_events = clutter_backend_egl_init_events; + backend_class->create_stage = clutter_backend_egl_create_stage; + backend_class->ensure_context = clutter_backend_egl_ensure_context; + backend_class->redraw = clutter_backend_egl_redraw; + backend_class->get_features = clutter_backend_egl_get_features; + backend_class->get_display_size = clutter_backend_egl_get_display_size; } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/eglnative/clutter-stage-egl.c clutter-0.7.4/clutter/eglnative/clutter-stage-egl.c --- clutter-0.7.2/clutter/eglnative/clutter-stage-egl.c 2008-06-16 14:36:04.000000000 +0100 +++ clutter-0.7.4/clutter/eglnative/clutter-stage-egl.c 2008-06-25 17:25:13.000000000 +0100 @@ -78,7 +78,7 @@ EGL_BLUE_SIZE, 5, EGL_DEPTH_SIZE, 16, EGL_ALPHA_SIZE, EGL_DONT_CARE, - EGL_STENCIL_SIZE, 2, + EGL_STENCIL_SIZE, 2, #ifdef HAVE_COGL_GLES2 EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, #else /* HAVE_COGL_GLES2 */ @@ -111,6 +111,8 @@ return; } + CLUTTER_NOTE (BACKEND, "Got %i configs", config_count); + if (stage_egl->egl_surface != EGL_NO_SURFACE) { eglDestroySurface (backend_egl->edpy, stage_egl->egl_surface); @@ -151,23 +153,24 @@ stage_egl->surface_width, stage_egl->surface_height); - + if (G_UNLIKELY (backend_egl->egl_context == NULL)) { - static const EGLint attribs[3] - = { EGL_CONTEXT_CLIENT_VERSION, #ifdef HAVE_COGL_GLES2 - 2, -#else /* HAVE_COGL_GLES2 */ - 1, -#endif - EGL_NONE }; - CLUTTER_NOTE (GL, "Creating EGL Context"); + static const EGLint attribs[3] + = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; backend_egl->egl_context = eglCreateContext (backend_egl->edpy, configs[0], EGL_NO_CONTEXT, attribs); +#else + /* Seems some GLES implementations 1.x do not like attribs... */ + backend_egl->egl_context = eglCreateContext (backend_egl->edpy, + configs[0], + EGL_NO_CONTEXT, + NULL); +#endif if (backend_egl->egl_context == EGL_NO_CONTEXT) { @@ -176,6 +179,8 @@ CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); return; } + + CLUTTER_NOTE (GL, "Created EGL Context"); } CLUTTER_NOTE (BACKEND, "Marking stage as realized and setting context"); @@ -234,17 +239,6 @@ } static void -clutter_stage_egl_allocate (ClutterActor *self, - const ClutterActorBox *box, - gboolean origin_changed) -{ - /* we cannot resize the frame buffer, so we just ignore - * any allocation we receive by simply interrupting the - * allocation chain. - */ -} - -static void clutter_stage_egl_dispose (GObject *gobject) { ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (gobject); @@ -268,7 +262,6 @@ actor_class->unrealize = clutter_stage_egl_unrealize; actor_class->get_preferred_width = clutter_stage_egl_get_preferred_width; actor_class->get_preferred_height = clutter_stage_egl_get_preferred_height; - actor_class->allocate = clutter_stage_egl_allocate; } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/eglx/clutter-stage-egl.c clutter-0.7.4/clutter/eglx/clutter-stage-egl.c --- clutter-0.7.2/clutter/eglx/clutter-stage-egl.c 2008-06-23 15:20:17.000000000 +0100 +++ clutter-0.7.4/clutter/eglx/clutter-stage-egl.c 2008-06-25 17:25:14.000000000 +0100 @@ -223,27 +223,28 @@ if (G_UNLIKELY (backend_egl->egl_context == None)) { - static const EGLint attribs[3] - = { EGL_CONTEXT_CLIENT_VERSION, #ifdef HAVE_COGL_GLES2 - 2, -#else /* HAVE_COGL_GLES2 */ - 1, -#endif - EGL_NONE }; - - CLUTTER_NOTE (GL, "Creating EGL Context"); + static const EGLint attribs[3] + = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; backend_egl->egl_context = eglCreateContext (backend_egl->edpy, - configs[0], + configs[0], EGL_NO_CONTEXT, attribs); - +#else + /* Seems some GLES implementations 1.x do not like attribs... */ + backend_egl->egl_context = eglCreateContext (backend_egl->edpy, + configs[0], + EGL_NO_CONTEXT, + NULL); +#endif if (backend_egl->egl_context == EGL_NO_CONTEXT) { g_critical ("Unable to create a suitable EGL context"); goto fail; } + + CLUTTER_NOTE (GL, "Created EGL Context"); } CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/fruity/clutter-backend-fruity.c clutter-0.7.4/clutter/fruity/clutter-backend-fruity.c --- clutter-0.7.2/clutter/fruity/clutter-backend-fruity.c 2008-06-23 10:59:27.000000000 +0100 +++ clutter-0.7.4/clutter/fruity/clutter-backend-fruity.c 2008-06-25 17:25:12.000000000 +0100 @@ -191,6 +191,33 @@ } static void +clutter_backend_egl_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend); + gint surface_width, surface_height; + + if (backend_egl->stage) + { + ClutterStageEgl *stage_egl; + + stage_egl = CLUTTER_STAGE_EGL (backend_egl->stage); + + surface_width = stage_egl->surface_width; + surface_height = stage_egl->surface_height; + } + else + surface_width = surface_height = 0; + + if (width) + *width = surface_width; + + if (height) + *height = surface_height; +} + +static void clutter_backend_egl_class_init (ClutterBackendEGLClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -200,13 +227,14 @@ gobject_class->dispose = clutter_backend_egl_dispose; gobject_class->finalize = clutter_backend_egl_finalize; - backend_class->pre_parse = clutter_backend_egl_pre_parse; - backend_class->post_parse = clutter_backend_egl_post_parse; - backend_class->init_events = clutter_backend_egl_init_events; - backend_class->create_stage = clutter_backend_egl_create_stage; - backend_class->ensure_context = clutter_backend_egl_ensure_context; - backend_class->redraw = clutter_backend_egl_redraw; - backend_class->get_features = clutter_backend_egl_get_features; + backend_class->pre_parse = clutter_backend_egl_pre_parse; + backend_class->post_parse = clutter_backend_egl_post_parse; + backend_class->init_events = clutter_backend_egl_init_events; + backend_class->create_stage = clutter_backend_egl_create_stage; + backend_class->ensure_context = clutter_backend_egl_ensure_context; + backend_class->redraw = clutter_backend_egl_redraw; + backend_class->get_features = clutter_backend_egl_get_features; + backend_class->get_display_size = clutter_backend_egl_get_display_size; } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/fruity/clutter-fruity.c clutter-0.7.4/clutter/fruity/clutter-fruity.c --- clutter-0.7.2/clutter/fruity/clutter-fruity.c 2008-06-23 10:59:27.000000000 +0100 +++ clutter-0.7.4/clutter/fruity/clutter-fruity.c 2008-06-25 17:25:12.000000000 +0100 @@ -18,10 +18,6 @@ #import #include "clutter-fruity.h" -static EGLDisplay mEGLDisplay; -static EGLContext mEGLContext; -static EGLSurface mEGLSurface; -static CoreSurfaceBufferRef mScreenSurface; static gboolean alive = TRUE; @interface StageView : UIView @@ -30,23 +26,6 @@ @end -static CoreSurfaceBufferRef CreateSurface(int w, int h) -{ - int pitch = w * 2, allocSize = 2 * w * h; - char *pixelFormat = "565L"; - CFMutableDictionaryRef dict; - - dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - CFDictionarySetValue(dict, kCoreSurfaceBufferGlobal, kCFBooleanTrue); - CFDictionarySetValue(dict, kCoreSurfaceBufferMemoryRegion, CFSTR("PurpleGFXMem")); - CFDictionarySetValue(dict, kCoreSurfaceBufferPitch, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pitch)); - CFDictionarySetValue(dict, kCoreSurfaceBufferWidth, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &w)); - CFDictionarySetValue(dict, kCoreSurfaceBufferHeight, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &h)); - CFDictionarySetValue(dict, kCoreSurfaceBufferPixelFormat, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, pixelFormat)); - CFDictionarySetValue(dict, kCoreSurfaceBufferAllocSize, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &allocSize)); - return CoreSurfaceBufferCreate(dict); -} - @implementation StageView @@ -85,6 +64,7 @@ struct GSPathPoint points[10]; } MEvent; +#define MAX_FINGERS 5 - (void)doEvent:(GSEvent*)gs_event { @@ -92,13 +72,12 @@ int i, j; ClutterMainContext *context; ClutterStage *stage = CLUTTER_STAGE_EGL(ba->stage)->wrapper; - int n_fingers = 0; MEvent *event = (MEvent*)gs_event; context = clutter_context_get_default (); - bool mapped[5] = {false, false, false, false, false}; /* an event has been mapped to this device */ - int evs[5] = {0,0,0,0,0}; + bool mapped[MAX_FINGERS] = {false, false, false, false, false}; /* an event has been mapped to this device */ + int evs[MAX_FINGERS] = {0,0,0,0,0}; for (i = 0; i < event->fingerCount; i++) { @@ -107,7 +86,7 @@ /* NSLog(@"IncomingEvent: %d, pos: %f, %f", i, event->points[i].x, event->points[i].y);*/ /* check if this finger maps to one of the existing devices */ - for (j = 0; j < 5; j++) + for (j = 0; j < MAX_FINGERS; j++) { ClutterFruityFingerDevice *dev; @@ -142,7 +121,7 @@ { ClutterFruityFingerDevice *dev; - for (j = 0; j < 5 /*n_fingers*/; j++) + for (j = 0; j < MAX_FINGERS; j++) { dev = g_slist_nth_data (context->input_devices, j); if (!dev->is_down) @@ -161,7 +140,7 @@ } } - for (j = 0; j < 5; j++) + for (j = 0; j < MAX_FINGERS; j++) { ClutterFruityFingerDevice *dev; diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/fruity/clutter-stage-fruity.c clutter-0.7.4/clutter/fruity/clutter-stage-fruity.c --- clutter-0.7.2/clutter/fruity/clutter-stage-fruity.c 2008-06-16 14:35:07.000000000 +0100 +++ clutter-0.7.4/clutter/fruity/clutter-stage-fruity.c 2008-06-25 17:25:12.000000000 +0100 @@ -218,17 +218,6 @@ } static void -clutter_stage_egl_allocate (ClutterActor *self, - const ClutterActorBox *box, - gboolean origin_changed) -{ - /* we cannot resize the frame buffer, so we just ignore - * any allocation we receive by simply interrupting the - * allocation chain. - */ -} - -static void clutter_stage_egl_dispose (GObject *gobject) { ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (gobject); @@ -252,7 +241,6 @@ actor_class->unrealize = clutter_stage_egl_unrealize; actor_class->get_preferred_width = clutter_stage_egl_get_preferred_width; actor_class->get_preferred_height = clutter_stage_egl_get_preferred_height; - actor_class->allocate = clutter_stage_egl_allocate; } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/osx/clutter-backend-osx.c clutter-0.7.4/clutter/osx/clutter-backend-osx.c --- clutter-0.7.2/clutter/osx/clutter-backend-osx.c 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/osx/clutter-backend-osx.c 2008-06-25 17:25:15.000000000 +0100 @@ -167,6 +167,38 @@ CLUTTER_OSX_POOL_RELEASE(); } +static void +clutter_backend_osx_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + int i; + int display_width, display_height; + NSArray *array; + + CLUTTER_OSX_ALLOC_POOL; + + array = [NSScreen screens]; + + display_width = display_height = 0; + + for (i = 0; i < [array count]; i++) + { + NSRect rect = [[array objectAtIndex:i] frame]; + + display_width += rect.size.width; + display_height += rect.size.height; + } + + CLUTTER_OSX_RELEASE_POOL; + + if (width) + *width = display_width; + + if (height) + *height = display_height; +} + /*************************************************************************/ static void @@ -198,12 +230,13 @@ object_class->dispose = clutter_backend_osx_dispose; - backend_class->post_parse = clutter_backend_osx_post_parse; - backend_class->get_features = clutter_backend_osx_get_features; - backend_class->create_stage = clutter_backend_osx_create_stage; - backend_class->ensure_context = clutter_backend_osx_ensure_context; - backend_class->init_events = clutter_backend_osx_init_events; - backend_class->redraw = clutter_backend_osx_redraw; + backend_class->post_parse = clutter_backend_osx_post_parse; + backend_class->get_features = clutter_backend_osx_get_features; + backend_class->create_stage = clutter_backend_osx_create_stage; + backend_class->ensure_context = clutter_backend_osx_ensure_context; + backend_class->init_events = clutter_backend_osx_init_events; + backend_class->redraw = clutter_backend_osx_redraw; + backend_class->get_display_size = clutter_backend_osx_get_display_size; } GType diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/sdl/clutter-backend-sdl.c clutter-0.7.4/clutter/sdl/clutter-backend-sdl.c --- clutter-0.7.2/clutter/sdl/clutter-backend-sdl.c 2008-06-10 13:20:19.000000000 +0100 +++ clutter-0.7.4/clutter/sdl/clutter-backend-sdl.c 2008-06-25 17:25:13.000000000 +0100 @@ -168,6 +168,32 @@ } static void +clutter_backend_sdl_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + SDL_Surface *surface; + + surface = SDL_GetVideoSurface (); + if (!surface) + { + if (width) + *width = 0; + + if (height) + *height = 0; + } + else + { + if (width) + *width = surface->w; + + if (height) + *height = surface->h; + } +} + +static void clutter_backend_sdl_class_init (ClutterBackendSDLClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -177,13 +203,14 @@ gobject_class->dispose = clutter_backend_sdl_dispose; gobject_class->finalize = clutter_backend_sdl_finalize; - backend_class->pre_parse = clutter_backend_sdl_pre_parse; - backend_class->post_parse = clutter_backend_sdl_post_parse; - backend_class->init_events = clutter_backend_sdl_init_events; - backend_class->create_stage = clutter_backend_sdl_create_stage; - backend_class->ensure_context = clutter_backend_sdl_ensure_context; - backend_class->redraw = clutter_backend_sdl_redraw; - backend_class->get_features = clutter_backend_sdl_get_features; + backend_class->pre_parse = clutter_backend_sdl_pre_parse; + backend_class->post_parse = clutter_backend_sdl_post_parse; + backend_class->init_events = clutter_backend_sdl_init_events; + backend_class->create_stage = clutter_backend_sdl_create_stage; + backend_class->ensure_context = clutter_backend_sdl_ensure_context; + backend_class->redraw = clutter_backend_sdl_redraw; + backend_class->get_features = clutter_backend_sdl_get_features; + backend_class->get_display_size = clutter_backend_sdl_get_display_size; } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/win32/clutter-backend-win32.c clutter-0.7.4/clutter/win32/clutter-backend-win32.c --- clutter-0.7.2/clutter/win32/clutter-backend-win32.c 2008-06-10 13:20:21.000000000 +0100 +++ clutter-0.7.4/clutter/win32/clutter-backend-win32.c 2008-06-25 17:57:49.000000000 +0100 @@ -40,7 +40,7 @@ G_DEFINE_TYPE (ClutterBackendWin32, clutter_backend_win32, CLUTTER_TYPE_BACKEND); -typedef int (* SwapIntervalProc) (int interval); +typedef int (WINAPI * SwapIntervalProc) (int interval); /* singleton object */ static ClutterBackendWin32 *backend_singleton = NULL; @@ -230,6 +230,30 @@ } static void +clutter_backend_win32_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + gint display_width, display_height; + + /* Try get the combined size of all of the monitors */ + if ((display_width = GetSystemMetrics (SM_CXVIRTUALSCREEN)) == 0 + || (display_height = GetSystemMetrics (SM_CYVIRTUALSCREEN)) == 0) + { + /* If the multi-monitor API isn't supported then just return the + size of the primary display */ + display_width = GetSystemMetrics (SM_CXSCREEN); + display_height = GetSystemMetrics (SM_CYSCREEN); + } + + if (width) + *width = display_width; + + if (height) + *height = display_height; +} + +static void clutter_backend_win32_ensure_context (ClutterBackend *backend, ClutterStage *stage) { @@ -336,13 +360,14 @@ gobject_class->dispose = clutter_backend_win32_dispose; gobject_class->finalize = clutter_backend_win32_finalize; - backend_class->pre_parse = clutter_backend_win32_pre_parse; - backend_class->init_events = clutter_backend_win32_init_events; - backend_class->create_stage = clutter_backend_win32_create_stage; - backend_class->add_options = clutter_backend_win32_add_options; - backend_class->get_features = clutter_backend_win32_get_features; - backend_class->redraw = clutter_backend_win32_redraw; - backend_class->ensure_context = clutter_backend_win32_ensure_context; + backend_class->pre_parse = clutter_backend_win32_pre_parse; + backend_class->init_events = clutter_backend_win32_init_events; + backend_class->create_stage = clutter_backend_win32_create_stage; + backend_class->add_options = clutter_backend_win32_add_options; + backend_class->get_features = clutter_backend_win32_get_features; + backend_class->get_display_size = clutter_backend_win32_get_display_size; + backend_class->redraw = clutter_backend_win32_redraw; + backend_class->ensure_context = clutter_backend_win32_ensure_context; } static void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/win32/clutter-stage-win32.c clutter-0.7.4/clutter/win32/clutter-stage-win32.c --- clutter-0.7.2/clutter/win32/clutter-stage-win32.c 2008-06-12 14:50:10.000000000 +0100 +++ clutter-0.7.4/clutter/win32/clutter-stage-win32.c 2008-06-25 17:25:15.000000000 +0100 @@ -398,6 +398,66 @@ return major > 1 || (major == 1 && minor >= 2); } +static gboolean +clutter_stage_win32_pixel_format_is_better (const PIXELFORMATDESCRIPTOR *pfa, + const PIXELFORMATDESCRIPTOR *pfb) +{ + /* Always prefer a format with a stencil buffer */ + if (pfa->cStencilBits == 0) + { + if (pfb->cStencilBits > 0) + return TRUE; + } + else if (pfb->cStencilBits == 0) + return FALSE; + + /* Prefer a bigger color buffer */ + if (pfb->cColorBits > pfa->cColorBits) + return TRUE; + else if (pfb->cColorBits < pfa->cColorBits) + return FALSE; + + /* Prefer a bigger depth buffer */ + return pfb->cDepthBits > pfa->cDepthBits; +} + +static int +clutter_stage_win32_choose_pixel_format (HDC dc, PIXELFORMATDESCRIPTOR *pfd) +{ + int i, num_formats, best_pf = 0; + PIXELFORMATDESCRIPTOR best_pfd; + + num_formats = DescribePixelFormat (dc, 0, sizeof (best_pfd), NULL); + + for (i = 1; i <= num_formats; i++) + { + memset (pfd, 0, sizeof (*pfd)); + + if (DescribePixelFormat (dc, i, sizeof (best_pfd), pfd) + /* Check whether this format is useable by Clutter */ + && ((pfd->dwFlags & (PFD_SUPPORT_OPENGL + | PFD_DRAW_TO_WINDOW + | PFD_DOUBLEBUFFER + | PFD_GENERIC_FORMAT)) + == (PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW)) + && pfd->iPixelType == PFD_TYPE_RGBA + && pfd->cColorBits >= 16 && pfd->cColorBits <= 32 + && pfd->cDepthBits >= 16 && pfd->cDepthBits <= 32 + /* Check whether this is a better format than one we've + already found */ + && (best_pf == 0 + || clutter_stage_win32_pixel_format_is_better (&best_pfd, pfd))) + { + best_pf = i; + best_pfd = *pfd; + } + } + + *pfd = best_pfd; + + return best_pf; +} + static void clutter_stage_win32_realize (ClutterActor *actor) { @@ -468,20 +528,9 @@ stage_win32->client_dc = GetDC (stage_win32->hwnd); - memset (&pfd, 0, sizeof (pfd)); - pfd.nSize = sizeof (pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL - | PFD_DOUBLEBUFFER | PFD_GENERIC_ACCELERATED; - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 24; - pfd.cAlphaBits = 8; - pfd.cDepthBits = 32; - pfd.cStencilBits = 8; - pfd.iLayerType = PFD_MAIN_PLANE; - - if ((pf = ChoosePixelFormat (stage_win32->client_dc, &pfd)) == 0 - || !SetPixelFormat (stage_win32->client_dc, pf, &pfd)) + pf = clutter_stage_win32_choose_pixel_format (stage_win32->client_dc, &pfd); + + if (pf == 0 || !SetPixelFormat (stage_win32->client_dc, pf, &pfd)) { g_critical ("Unable to find suitable GL pixel format"); goto fail; diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/x11/clutter-backend-x11.c clutter-0.7.4/clutter/x11/clutter-backend-x11.c --- clutter-0.7.2/clutter/x11/clutter-backend-x11.c 2008-06-23 10:59:28.000000000 +0100 +++ clutter-0.7.4/clutter/x11/clutter-backend-x11.c 2008-06-25 17:25:15.000000000 +0100 @@ -312,6 +312,31 @@ } static void +clutter_backend_x11_get_display_size (ClutterBackend *backend, + gint *width, + gint *height) +{ + ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend); + gint display_width, display_height; + + if (G_LIKELY (backend_x11->xdpy)) + { + display_width = DisplayWidth (backend_x11->xdpy, + backend_x11->xscreen_num); + display_height = DisplayHeight (backend_x11->xdpy, + backend_x11->xscreen_num); + } + else + display_width = display_height = 0; + + if (width) + *width = display_width; + + if (height) + *height = display_height; +} + +static void clutter_backend_x11_class_init (ClutterBackendX11Class *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -321,11 +346,12 @@ gobject_class->dispose = clutter_backend_x11_dispose; gobject_class->finalize = clutter_backend_x11_finalize; - backend_class->pre_parse = clutter_backend_x11_pre_parse; - backend_class->post_parse = clutter_backend_x11_post_parse; - backend_class->init_events = clutter_backend_x11_init_events; - backend_class->add_options = clutter_backend_x11_add_options; - backend_class->get_features = clutter_backend_x11_get_features; + backend_class->pre_parse = clutter_backend_x11_pre_parse; + backend_class->post_parse = clutter_backend_x11_post_parse; + backend_class->init_events = clutter_backend_x11_init_events; + backend_class->add_options = clutter_backend_x11_add_options; + backend_class->get_features = clutter_backend_x11_get_features; + backend_class->get_display_size = clutter_backend_x11_get_display_size; } static void @@ -568,7 +594,8 @@ gint num_devices = 0; gint num_events = 0; gint i = 0, j = 0; - + gboolean have_an_xpointer = FALSE; + ClutterBackendX11 *x11b; ClutterX11XInputDevice *device = NULL; @@ -617,11 +644,15 @@ info->use == IsXExtensionKeyboard || info->use == IsXExtensionDevice) { + clutter_x11_trap_x_errors (); + xdevice = XOpenDevice (x11b->xdpy, info->id); + if (clutter_x11_untrap_x_errors () || xdevice == NULL) + continue; + /* Create the appropriate Clutter device */ device = g_new0 (ClutterX11XInputDevice, 1); context->input_devices = g_slist_append (context->input_devices, device); - xdevice = XOpenDevice (x11b->xdpy, info->id); device->device.id = info->id; /* FIXME: some kind of general device_init() call should do below */ @@ -638,6 +669,7 @@ { case IsXExtensionPointer: device->type = CLUTTER_X11_XINPUT_POINTER_DEVICE; + have_an_xpointer = TRUE; break; case IsXExtensionKeyboard: device->type = CLUTTER_X11_XINPUT_KEYBOARD_DEVICE; @@ -694,11 +726,25 @@ } } + if (info->use == IsXExtensionPointer && num_events > 0) + have_an_xpointer = TRUE; + device->num_events = num_events; } } XFree (xdevices); + + if (!have_an_xpointer) + { + /* Something is likely wrong with Xinput setup so we basically + * abort here and fall back to lofi regular xinput. + */ + g_warning ("No usuable XInput pointing devices found"); + backend_singleton->have_xinput = FALSE; + g_slist_free (context->input_devices); + context->input_devices = NULL; + } } void diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/clutter/x11/clutter-event-x11.c clutter-0.7.4/clutter/x11/clutter-event-x11.c --- clutter-0.7.2/clutter/x11/clutter-event-x11.c 2008-06-23 15:20:17.000000000 +0100 +++ clutter-0.7.4/clutter/x11/clutter-event-x11.c 2008-06-25 17:25:15.000000000 +0100 @@ -583,13 +583,14 @@ switch (xevent->type) { case KeyPress: - event->type = CLUTTER_KEY_PRESS; + event->key.type = event->type = CLUTTER_KEY_PRESS; translate_key_event (backend, event, xevent); + set_user_time (backend_x11, &xwindow, xevent->xkey.time); break; case KeyRelease: - event->type = CLUTTER_KEY_RELEASE; + event->key.type = event->type = CLUTTER_KEY_RELEASE; translate_key_event (backend, event, xevent); break; @@ -768,6 +769,7 @@ event->key.type = event->type = CLUTTER_KEY_PRESS; translate_key_event (backend, event, &xevent_converted); + set_user_time (backend_x11, &xwindow, xkev->time); } else if (xevent->type @@ -778,7 +780,7 @@ convert_xdevicekey_to_xkey (xkev, &xevent_converted); - event->type = CLUTTER_KEY_RELEASE; + event->key.type = event->type = CLUTTER_KEY_RELEASE; translate_key_event (backend, event, &xevent_converted); } else diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/config.rpath clutter-0.7.4/config.rpath --- clutter-0.7.2/config.rpath 2008-06-10 15:11:42.000000000 +0100 +++ clutter-0.7.4/config.rpath 1970-01-01 01:00:00.000000000 +0100 @@ -1,666 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2007 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit , 1996 -# -# 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. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -# Code taken from libtool.m4's _LT_CC_BASENAME. - -for cc_temp in $CC""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | cygwin* | pw32* | os2*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - newsos6) - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - wl='-Wl,' - ;; - pgcc | pgf77 | pgf90) - wl='-Wl,' - ;; - ccc*) - wl='-Wl,' - ;; - como) - wl='-lopt=' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - wl='-Wl,' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - rdos*) - ;; - solaris*) - wl='-Wl,' - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - wl='-Wl,' - ;; - unicos*) - wl='-Wl,' - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - hardcode_direct=yes - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - hardcode_libdir_flag_spec= - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 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 - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - hardcode_direct=no - if test "$GCC" = yes ; then - : - else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd1*) - ld_shlibs=no - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd* | dragonfly*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - ;; - *) - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - ;; - sysv5* | sco3.2v5* | sco5v6*) - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. -# Unlike libtool.m4, here we don't care about _all_ names of the library, but -# only about the one the linker finds when passed -lNAME. This is the last -# element of library_names_spec in libtool.m4, or possibly two of them if the -# linker has special search rules. -library_names_spec= # the last element of library_names_spec in libtool.m4 -libname_spec='lib$name' -case "$host_os" in - aix3*) - library_names_spec='$libname.a' - ;; - aix4* | aix5*) - library_names_spec='$libname$shrext' - ;; - amigaos*) - library_names_spec='$libname.a' - ;; - beos*) - library_names_spec='$libname$shrext' - ;; - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; - cygwin* | mingw* | pw32*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; - darwin* | rhapsody*) - shrext=.dylib - library_names_spec='$libname$shrext' - ;; - dgux*) - library_names_spec='$libname$shrext' - ;; - freebsd1*) - ;; - freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac - ;; - gnu*) - library_names_spec='$libname$shrext' - ;; - hpux9* | hpux10* | hpux11*) - case $host_cpu in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - library_names_spec='$libname$shrext' - ;; - interix[3-9]*) - library_names_spec='$libname$shrext' - ;; - irix5* | irix6* | nonstopux*) - library_names_spec='$libname$shrext' - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux* | k*bsd*-gnu) - library_names_spec='$libname$shrext' - ;; - knetbsd*-gnu) - library_names_spec='$libname$shrext' - ;; - netbsd*) - library_names_spec='$libname$shrext' - ;; - newsos6) - library_names_spec='$libname$shrext' - ;; - nto-qnx*) - library_names_spec='$libname$shrext' - ;; - openbsd*) - library_names_spec='$libname$shrext$versuffix' - ;; - os2*) - libname_spec='$name' - shrext=.dll - library_names_spec='$libname.a' - ;; - osf3* | osf4* | osf5*) - library_names_spec='$libname$shrext' - ;; - rdos*) - ;; - solaris*) - library_names_spec='$libname$shrext' - ;; - sunos4*) - library_names_spec='$libname$shrext$versuffix' - ;; - sysv4 | sysv4.3*) - library_names_spec='$libname$shrext' - ;; - sysv4*MP*) - library_names_spec='$libname$shrext' - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - library_names_spec='$libname$shrext' - ;; - uts4*) - library_names_spec='$libname$shrext' - ;; -esac - -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='clutter' PACKAGE_TARNAME='clutter' -PACKAGE_VERSION='0.7.2' -PACKAGE_STRING='clutter 0.7.2' +PACKAGE_VERSION='0.7.4' +PACKAGE_STRING='clutter 0.7.4' PACKAGE_BUGREPORT='http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter' ac_unique_file="clutter/clutter.h" @@ -1471,7 +1471,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures clutter 0.7.2 to adapt to many kinds of systems. +\`configure' configures clutter 0.7.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clutter 0.7.2:";; + short | recursive ) echo "Configuration of clutter 0.7.4:";; esac cat <<\_ACEOF @@ -1682,7 +1682,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clutter configure 0.7.2 +clutter configure 0.7.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1696,7 +1696,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by clutter $as_me 0.7.2, which was +It was created by clutter $as_me 0.7.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2390,7 +2390,7 @@ # Define the identity of the package. PACKAGE='clutter' - VERSION='0.7.2' + VERSION='0.7.4' cat >>confdefs.h <<_ACEOF @@ -2539,8 +2539,8 @@ CLUTTER_MAJOR_VERSION=0 CLUTTER_MINOR_VERSION=7 -CLUTTER_MICRO_VERSION=2 -CLUTTER_VERSION=0.7.2 +CLUTTER_MICRO_VERSION=4 +CLUTTER_VERSION=0.7.4 CLUTTER_API_VERSION=0.7 CLUTTER_MAJORMINOR=0.7 @@ -2553,9 +2553,9 @@ -CLUTTER_LT_CURRENT=702 +CLUTTER_LT_CURRENT=704 CLUTTER_LT_REV=0 -CLUTTER_LT_AGE=702 +CLUTTER_LT_AGE=704 CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE" CLUTTER_LT_LDFLAGS="-version-info $CLUTTER_LT_VERSION" @@ -26244,7 +26244,7 @@ < $srcdir/po/POTFILES.in > po/POTFILES -ac_config_files="$ac_config_files Makefile clutter/Makefile clutter/clutter-version.h clutter/clutter-json.h clutter/x11/Makefile clutter/x11/clutter-x11.pc clutter/glx/Makefile clutter/eglx/Makefile clutter/eglnative/Makefile clutter/fruity/Makefile clutter/osx/Makefile clutter/win32/Makefile clutter/win32/clutter-win32.pc clutter/sdl/Makefile clutter/cogl/Makefile clutter/cogl/common/Makefile clutter/cogl/cogl.h clutter/cogl/cogl-defines-gl.h:clutter/cogl/gl/cogl-defines.h.in clutter/cogl/cogl-defines-gles.h:clutter/cogl/gles/cogl-defines.h.in clutter/cogl/gl/Makefile clutter/cogl/gles/Makefile clutter/json/Makefile clutter/pango/Makefile tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/clutter/Makefile doc/reference/clutter/version.xml doc/reference/cogl/Makefile doc/manual/clutter-manual.xml doc/manual/Makefile po/Makefile.in clutter.pc" +ac_config_files="$ac_config_files Makefile clutter/Makefile clutter/clutter-version.h clutter/clutter-json.h clutter/x11/Makefile clutter/x11/clutter-x11.pc clutter/glx/Makefile clutter/eglx/Makefile clutter/eglnative/Makefile clutter/fruity/Makefile clutter/osx/Makefile clutter/win32/Makefile clutter/win32/clutter-win32.pc clutter/sdl/Makefile clutter/cogl/Makefile clutter/cogl/common/Makefile clutter/cogl/cogl.h clutter/cogl/cogl-defines-gl.h:clutter/cogl/gl/cogl-defines.h.in clutter/cogl/cogl-defines-gles.h:clutter/cogl/gles/cogl-defines.h.in clutter/cogl/gl/Makefile clutter/cogl/gles/Makefile clutter/json/Makefile clutter/pango/Makefile tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/clutter/Makefile doc/reference/clutter/version.xml doc/reference/cogl/Makefile doc/reference/cogl/version.xml doc/manual/clutter-manual.xml doc/manual/Makefile po/Makefile.in clutter.pc" cat >confcache <<\_ACEOF @@ -26706,7 +26706,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by clutter $as_me 0.7.2, which was +This file was extended by clutter $as_me 0.7.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26759,7 +26759,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -clutter config.status 0.7.2 +clutter config.status 0.7.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -26906,6 +26906,7 @@ "doc/reference/clutter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/clutter/Makefile" ;; "doc/reference/clutter/version.xml") CONFIG_FILES="$CONFIG_FILES doc/reference/clutter/version.xml" ;; "doc/reference/cogl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/cogl/Makefile" ;; + "doc/reference/cogl/version.xml") CONFIG_FILES="$CONFIG_FILES doc/reference/cogl/version.xml" ;; "doc/manual/clutter-manual.xml") CONFIG_FILES="$CONFIG_FILES doc/manual/clutter-manual.xml" ;; "doc/manual/Makefile") CONFIG_FILES="$CONFIG_FILES doc/manual/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; @@ -27819,10 +27820,10 @@ # the experimental/unstable warning summary. if test "x$imagebackend" = "xinternal"; then - experimental_stuff="$experimental_stuff imagebackend=$imagebackend\n" + experimental_stuff="$experimental_stuff imagebackend: $imagebackend\n" fi if test "x$clutterbackend" = "xfruity"; then - experimental_stuff="$experimental_stuff clutterbackend=$clutterbackend\n" + experimental_stuff="$experimental_stuff clutterbackend: $clutterbackend\n" fi @@ -27833,7 +27834,8 @@ echo "" echo " Experimental features configured, stability of your build either uses" echo " experimental backends or experimental and unsupported features:" -echo -e " $experimental_stuff" +echo "" +echo -e "$experimental_stuff" echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠" echo "" fi diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/configure.ac clutter-0.7.4/configure.ac --- clutter-0.7.2/configure.ac 2008-06-23 17:10:49.000000000 +0100 +++ clutter-0.7.4/configure.ac 2008-06-25 17:46:58.000000000 +0100 @@ -3,7 +3,7 @@ # An even micro number indicates a released version. m4_define([clutter_major_version], [0]) m4_define([clutter_minor_version], [7]) -m4_define([clutter_micro_version], [2]) +m4_define([clutter_micro_version], [4]) m4_define([clutter_version], [clutter_major_version.clutter_minor_version.clutter_micro_version]) @@ -656,6 +656,7 @@ doc/reference/clutter/Makefile doc/reference/clutter/version.xml doc/reference/cogl/Makefile + doc/reference/cogl/version.xml doc/manual/clutter-manual.xml doc/manual/Makefile po/Makefile.in @@ -690,10 +691,10 @@ # the experimental/unstable warning summary. if test "x$imagebackend" = "xinternal"; then - experimental_stuff="$experimental_stuff imagebackend=$imagebackend\n" + experimental_stuff="$experimental_stuff imagebackend: $imagebackend\n" fi if test "x$clutterbackend" = "xfruity"; then - experimental_stuff="$experimental_stuff clutterbackend=$clutterbackend\n" + experimental_stuff="$experimental_stuff clutterbackend: $clutterbackend\n" fi @@ -704,7 +705,8 @@ echo "" echo " Experimental features configured, stability of your build either uses" echo " experimental backends or experimental and unsupported features:" -echo -e " $experimental_stuff" +echo "" +echo -e "$experimental_stuff" echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠" echo "" fi diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/ChangeLog clutter-0.7.4/doc/reference/ChangeLog --- clutter-0.7.2/doc/reference/ChangeLog 2008-06-23 16:55:44.000000000 +0100 +++ clutter-0.7.4/doc/reference/ChangeLog 2008-06-25 17:49:14.000000000 +0100 @@ -1,3 +1,26 @@ +2008-06-25 Emmanuele Bassi + + * clutter/clutter-sections.txt: Add missing symbols. + +2008-06-25 Emmanuele Bassi + + * clutter/clutter-sections.txt: Add + clutter_backend_get_display_size() to the documented symbols. + +2008-06-24 Matthew Allum + + * cogl/Makefile.am: + * cogl/cogl-docs.sgml: + * cogl/version.xml.in: + * clutter/version.xml.in: + Add full version (including minor) to docs. + Add version to COGL docs + +2008-06-23 Emmanuele Bassi + + * clutter/clutter-sections.txt: Remove clutter_actor_get_paint_area() + and add clutter_actor_allocate_preferred_size(). + 2008-06-23 Emmanuele Bassi * clutter/subclassing-ClutterActor.sgml: Remove mention of the diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/clutter-sections.txt clutter-0.7.4/doc/reference/clutter/clutter-sections.txt --- clutter-0.7.2/doc/reference/clutter/clutter-sections.txt 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/clutter-sections.txt 2008-06-25 17:58:29.000000000 +0100 @@ -352,6 +352,7 @@ clutter_actor_allocate +clutter_actor_allocate_preferred_size clutter_actor_get_allocation_coords clutter_actor_get_allocation_box clutter_actor_get_allocation_geometry @@ -359,7 +360,6 @@ clutter_actor_get_preferred_size clutter_actor_get_preferred_width clutter_actor_get_preferred_height -clutter_actor_get_paint_area clutter_actor_set_fixed_position_set clutter_actor_get_fixed_position_set @@ -843,6 +843,7 @@ clutter_backend_set_double_click_distance clutter_backend_set_font_options clutter_backend_get_font_options +clutter_backend_get_display_size CLUTTER_BACKEND CLUTTER_IS_BACKEND @@ -1040,6 +1041,10 @@ clutter_key_event_unicode clutter_keysym_to_unicode + +clutter_event_get_device_id +clutter_get_input_device_for_id + CLUTTER_TYPE_EVENT @@ -1050,6 +1055,10 @@
clutter-main General +CLUTTER_PRIORITY_REDRAW +CLUTTER_PRIORITY_TIMELINE + + ClutterInitError clutter_init clutter_init_with_args @@ -1094,6 +1103,8 @@ clutter_grab_pointer clutter_ungrab_keyboard clutter_ungrab_pointer +clutter_grab_pointer_for_device +clutter_ungrab_pointer_for_device clutter_do_event @@ -1127,6 +1138,14 @@ ClutterX11FilterReturn clutter_x11_add_filter clutter_x11_remove_filter + + +ClutterX11InputDeviceType +ClutterX11XInputDevice +ClutterX11XInputEventTypes +clutter_x11_get_input_device_type +clutter_x11_get_input_devices +clutter_x11_has_xinput
@@ -1259,6 +1278,8 @@ ClutterScriptError clutter_script_load_from_data clutter_script_load_from_file +clutter_script_add_search_paths +clutter_script_lookup_filename clutter_script_get_object diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterActor.html clutter-0.7.4/doc/reference/clutter/html/ClutterActor.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterActor.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterActor.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterActor - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -107,6 +107,9 @@ void clutter_actor_allocate (ClutterActor *self, const ClutterActorBox *box, gboolean absolute_origin_changed); +void clutter_actor_allocate_preferred_size + (ClutterActor *self, + gboolean absolute_origin_changed); void clutter_actor_get_allocation_coords (ClutterActor *self, gint *x_1, gint *y_1, @@ -1537,6 +1540,49 @@
+

clutter_actor_allocate_preferred_size ()

+
void                clutter_actor_allocate_preferred_size
+                                                        (ClutterActor *self,
+                                                         gboolean absolute_origin_changed);
+

+Allocates the natural size of self. +

+

+This function is a utility call for ClutterActor implementations +that allocates the actor's preferred natural size. It can be used +by fixed layout managers (like ClutterGroup or so called +'composite actors') inside the ClutterActor::allocate +implementation to give each child exactly how much space it +requires. +

+

+This function is not meant to be used by applications. It is also +not meant to be used outside the implementation of the +ClutterActor::allocate virtual function.

+

+ +

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

self :

 a ClutterActor +

absolute_origin_changed :

 whether the position of the parent has + changed in stage coordinates +
+

Since 0.8 +

+
+
+

clutter_actor_get_allocation_coords ()

void                clutter_actor_get_allocation_coords (ClutterActor *self,
                                                          gint *x_1,
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterAlpha.html clutter-0.7.4/doc/reference/clutter/html/ClutterAlpha.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterAlpha.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterAlpha.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterAlpha
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviour.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviour.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviour.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviour.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviour
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourBspline.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourBspline.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourBspline.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourBspline.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourBspline
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourDepth.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourDepth.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourDepth.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourDepth.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourDepth
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourEllipse.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourEllipse.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourEllipse.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourEllipse.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourEllipse
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourOpacity.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourOpacity.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourOpacity.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourOpacity.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourOpacity
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourPath.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourPath.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourPath.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourPath.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourPath
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourRotate.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourRotate.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourRotate.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourRotate.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourRotate
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourScale.html clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourScale.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterBehaviourScale.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterBehaviourScale.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterBehaviourScale
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterChildMeta.html clutter-0.7.4/doc/reference/clutter/html/ClutterChildMeta.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterChildMeta.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterChildMeta.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterChildMeta
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterCloneTexture.html clutter-0.7.4/doc/reference/clutter/html/ClutterCloneTexture.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterCloneTexture.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterCloneTexture.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterCloneTexture
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterContainer.html clutter-0.7.4/doc/reference/clutter/html/ClutterContainer.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterContainer.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterContainer.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterContainer
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterEntry.html clutter-0.7.4/doc/reference/clutter/html/ClutterEntry.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterEntry.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterEntry.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterEntry
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
@@ -89,10 +89,16 @@
                                                          const ClutterColor *color);
 void                clutter_entry_get_color             (ClutterEntry *entry,
                                                          ClutterColor *color);
-PangoLayout*        clutter_entry_get_layout            (ClutterEntry *entry);
+PangoLayout*        clutter_entry_get_layout            (ClutterEntry *entry);
 void                clutter_entry_set_alignment         (ClutterEntry *entry,
-                                                         PangoAlignment alignment);
-PangoAlignment      clutter_entry_get_alignment         (ClutterEntry *entry);
+                                                         PangoAlignment alignment);
+PangoAlignment      clutter_entry_get_alignment         (ClutterEntry *entry);
 void                clutter_entry_set_cursor_position   (ClutterEntry *entry,
                                                          gint position);
 gint                clutter_entry_get_cursor_position   (ClutterEntry *entry);
@@ -140,7 +146,9 @@
 

 
Properties

 
-  "alignment"                PangoAlignment        : Read / Write
+  "alignment"                PangoAlignment        : Read / Write
   "color"                    ClutterColor*         : Read / Write
   "cursor-visible"           gboolean              : Read / Write
   "entry-padding"            guint                 : Read / Write
@@ -390,7 +398,9 @@
 

 font_name must be a string containing the font name and its
 size, similarly to what you would feed to the
-pango_font_description_from_string() function.

+pango_font_description_from_string() function.

 

 
 

@@ -432,7 +442,9 @@
 
 
Returns :

  a string containing the font name, in a format
-  understandable by pango_font_description_from_string().  The
+  understandable by pango_font_description_from_string().  The
   string is owned by ClutterEntry and should not be modified
   or freed.
 
@@ -502,9 +514,13 @@
 

 

 
clutter_entry_get_layout ()

-
PangoLayout*        clutter_entry_get_layout            (ClutterEntry *entry);

+
PangoLayout*        clutter_entry_get_layout            (ClutterEntry *entry);

 

-Gets the PangoLayout used to display the entry.
+Gets the PangoLayout used to display the entry.
 The layout is useful to e.g. convert text positions to
 pixel positions.
 The returned layout is owned by the entry so need not be
@@ -522,7 +538,9 @@
 
 
 
Returns :

- the PangoLayout for this entry
+ the PangoLayout for this entry
 
 
 
@@ -535,7 +553,9 @@
 

 
clutter_entry_set_alignment ()

 
void                clutter_entry_set_alignment         (ClutterEntry *entry,
-                                                         PangoAlignment alignment);

+                                                         PangoAlignment alignment);

 

 Sets text alignment of the entry.

 

@@ -551,7 +571,9 @@
 
 
 
alignment :

- A PangoAlignment
+ A PangoAlignment
 
 
 
@@ -562,7 +584,9 @@
 

 

 
clutter_entry_get_alignment ()

-
PangoAlignment      clutter_entry_get_alignment         (ClutterEntry *entry);

+
PangoAlignment      clutter_entry_get_alignment         (ClutterEntry *entry);

 

 Returns the entry's text alignment

 

@@ -578,7 +602,9 @@
 
 
 
Returns :

- The entry's PangoAlignment
+ The entry's PangoAlignment
 
 Since 0.4
 
@@ -1059,7 +1085,9 @@
 
Property Details

 

 
The "alignment" property

-
  "alignment"                PangoAlignment        : Read / Write

+
  "alignment"                PangoAlignment        : Read / Write

 

 The preferred alignment for the string.

 

@@ -1113,7 +1141,9 @@
 
  "font-name"                gchar*                : Read / Write

 

 The font to be used by the entry, expressed in a string that
-can be parsed by pango_font_description_from_string().

+can be parsed by pango_font_description_from_string().

 

 
 

diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterGroup.html clutter-0.7.4/doc/reference/clutter/html/ClutterGroup.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterGroup.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterGroup.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterGroup
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterLabel.html clutter-0.7.4/doc/reference/clutter/html/ClutterLabel.html
--- clutter-0.7.2/doc/reference/clutter/html/ClutterLabel.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/ClutterLabel.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 ClutterLabel
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
@@ -88,24 +88,42 @@
 void                clutter_label_get_color             (ClutterLabel *label,
                                                          ClutterColor *color);
 void                clutter_label_set_ellipsize         (ClutterLabel *label,
-                                                         PangoEllipsizeMode mode);
-PangoEllipsizeMode  clutter_label_get_ellipsize         (ClutterLabel *label);
+                                                         PangoEllipsizeMode mode);
+PangoEllipsizeMode  clutter_label_get_ellipsize         (ClutterLabel *label);
 void                clutter_label_set_line_wrap         (ClutterLabel *label,
                                                          gboolean wrap);
 gboolean            clutter_label_get_line_wrap         (ClutterLabel *label);
 void                clutter_label_set_line_wrap_mode    (ClutterLabel *label,
-                                                         PangoWrapMode wrap_mode);
-PangoWrapMode       clutter_label_get_line_wrap_mode    (ClutterLabel *label);
-PangoLayout*        clutter_label_get_layout            (ClutterLabel *label);
+                                                         PangoWrapMode wrap_mode);
+PangoWrapMode       clutter_label_get_line_wrap_mode    (ClutterLabel *label);
+PangoLayout*        clutter_label_get_layout            (ClutterLabel *label);
 void                clutter_label_set_attributes        (ClutterLabel *label,
-                                                         PangoAttrList *attrs);
-PangoAttrList*      clutter_label_get_attributes        (ClutterLabel *label);
+                                                         PangoAttrList *attrs);
+PangoAttrList*      clutter_label_get_attributes        (ClutterLabel *label);
 void                clutter_label_set_use_markup        (ClutterLabel *label,
                                                          gboolean setting);
 gboolean            clutter_label_get_use_markup        (ClutterLabel *label);
 void                clutter_label_set_alignment         (ClutterLabel *label,
-                                                         PangoAlignment alignment);
-PangoAlignment      clutter_label_get_alignment         (ClutterLabel *label);
+                                                         PangoAlignment alignment);
+PangoAlignment      clutter_label_get_alignment         (ClutterLabel *label);
 gboolean            clutter_label_get_justify           (ClutterLabel *label);
 void                clutter_label_set_justify           (ClutterLabel *label,
                                                          gboolean justify);
@@ -129,16 +147,24 @@
 

 
Properties

 
-  "alignment"                PangoAlignment        : Read / Write
-  "attributes"               PangoAttrList*        : Read / Write
+  "alignment"                PangoAlignment        : Read / Write
+  "attributes"               PangoAttrList*        : Read / Write
   "color"                    ClutterColor*         : Read / Write
-  "ellipsize"                PangoEllipsizeMode    : Read / Write
+  "ellipsize"                PangoEllipsizeMode    : Read / Write
   "font-name"                gchar*                : Read / Write
   "justify"                  gboolean              : Read / Write
   "text"                     gchar*                : Read / Write
   "use-markup"               gboolean              : Read / Write
   "wrap"                     gboolean              : Read / Write
-  "wrap-mode"                PangoWrapMode         : Read / Write
+  "wrap-mode"                PangoWrapMode         : Read / Write
 

 

 

@@ -318,7 +344,9 @@
 

 font_name must be a string containing the font name and its
 size, similarly to what you would feed to the
-pango_font_description_from_string() function.

+pango_font_description_from_string() function.

 

 
 

@@ -358,7 +386,9 @@
 
 
Returns :

  a string containing the font name, in a format
-  understandable by pango_font_description_from_string().  The
+  understandable by pango_font_description_from_string().  The
   string is owned by label and should not be modified
   or freed.
 
@@ -422,7 +452,9 @@
 

 
clutter_label_set_ellipsize ()

 
void                clutter_label_set_ellipsize         (ClutterLabel *label,
-                                                         PangoEllipsizeMode mode);

+                                                         PangoEllipsizeMode mode);

Sets the mode used to ellipsize (add an ellipsis: "...") to the text if there is not enough space to render the entire string.

@@ -439,7 +471,9 @@

mode :

- a PangoEllipsizeMode + a PangoEllipsizeMode @@ -450,7 +484,9 @@

clutter_label_get_ellipsize ()

-
PangoEllipsizeMode  clutter_label_get_ellipsize         (ClutterLabel *label);
+
PangoEllipsizeMode  clutter_label_get_ellipsize         (ClutterLabel *label);

Returns the ellipsizing position of the label. See clutter_label_set_ellipsize().

@@ -467,7 +503,9 @@

Returns :

- PangoEllipsizeMode + PangoEllipsizeMode @@ -540,7 +578,9 @@

clutter_label_set_line_wrap_mode ()

void                clutter_label_set_line_wrap_mode    (ClutterLabel *label,
-                                                         PangoWrapMode wrap_mode);
+ PangoWrapMode wrap_mode);

If line wrapping is on (see clutter_label_set_line_wrap()) this controls how the line wrapping is done. The default is PANGO_WRAP_WORD which means @@ -569,7 +609,9 @@

clutter_label_get_line_wrap_mode ()

-
PangoWrapMode       clutter_label_get_line_wrap_mode    (ClutterLabel *label);
+
PangoWrapMode       clutter_label_get_line_wrap_mode    (ClutterLabel *label);

Returns line wrap mode used by the label. See clutter_label_set_line_wrap_mode().

@@ -598,9 +640,13 @@

clutter_label_get_layout ()

-
PangoLayout*        clutter_label_get_layout            (ClutterLabel *label);
+
PangoLayout*        clutter_label_get_layout            (ClutterLabel *label);

-Gets the PangoLayout used to display the label. +Gets the PangoLayout used to display the label. The layout is useful to e.g. convert text positions to pixel positions. The returned layout is owned by the label so need not be @@ -618,7 +664,9 @@

Returns :

- the PangoLayout for this label + the PangoLayout for this label @@ -631,9 +679,13 @@

clutter_label_set_attributes ()

void                clutter_label_set_attributes        (ClutterLabel *label,
-                                                         PangoAttrList *attrs);
+ PangoAttrList *attrs);

-Sets a PangoAttrList; the attributes in the list are applied to the +Sets a PangoAttrList; the attributes in the list are applied to the label text. The attributes set with this function will be ignored if the "use_markup" property is TRUE.

@@ -650,7 +702,9 @@

attrs :

- a PangoAttrList + a PangoAttrList @@ -661,7 +715,9 @@

clutter_label_get_attributes ()

-
PangoAttrList*      clutter_label_get_attributes        (ClutterLabel *label);
+
PangoAttrList*      clutter_label_get_attributes        (ClutterLabel *label);

Gets the attribute list that was set on the label using clutter_label_set_attributes(), if any.

@@ -693,8 +749,10 @@ 
void                clutter_label_set_use_markup        (ClutterLabel *label,
                                                          gboolean setting);

-Sets whether the text of the label contains markup in Pango's text markup -language.

+Sets whether the text of the label contains markup in Pango's text markup +language.

@@ -720,8 +778,10 @@ 
gboolean            clutter_label_get_use_markup        (ClutterLabel *label);

Returns whether the label's text is interpreted as marked up with -the Pango text markup -language. See clutter_label_set_use_markup().

+the Pango text markup +language. See clutter_label_set_use_markup().

@@ -745,7 +805,9 @@

clutter_label_set_alignment ()

void                clutter_label_set_alignment         (ClutterLabel *label,
-                                                         PangoAlignment alignment);
+ PangoAlignment alignment);

Sets text alignment of the label.

@@ -761,7 +823,9 @@

alignment :

- A PangoAlignment + A PangoAlignment @@ -770,7 +834,9 @@

clutter_label_get_alignment ()

-
PangoAlignment      clutter_label_get_alignment         (ClutterLabel *label);
+
PangoAlignment      clutter_label_get_alignment         (ClutterLabel *label);

Returns the label's text alignment

@@ -786,7 +852,9 @@

Returns :

- The label's PangoAlignment + The label's PangoAlignment Since 0.2 @@ -857,14 +925,18 @@

Property Details

The "alignment" property

-
  "alignment"                PangoAlignment        : Read / Write
+
  "alignment"                PangoAlignment        : Read / Write

The preferred alignment for the string.

Default value: PANGO_ALIGN_LEFT

The "attributes" property

-
  "attributes"               PangoAttrList*        : Read / Write
+
  "attributes"               PangoAttrList*        : Read / Write

A list of style attributes to apply to the text of the label.

@@ -876,7 +948,9 @@

The "ellipsize" property

-
  "ellipsize"                PangoEllipsizeMode    : Read / Write
+
  "ellipsize"                PangoEllipsizeMode    : Read / Write

The preferred place to ellipsize the string, if the label does not have enough room to display the entire string.

Default value: PANGO_ELLIPSIZE_NONE

@@ -925,7 +999,9 @@

The "wrap-mode" property

-
  "wrap-mode"                PangoWrapMode         : Read / Write
+
  "wrap-mode"                PangoWrapMode         : Read / Write

If wrap is set, controls how line-wrapping is done.

Default value: PANGO_WRAP_WORD

diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterListModel.html clutter-0.7.4/doc/reference/clutter/html/ClutterListModel.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterListModel.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterListModel.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterListModel - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterMedia.html clutter-0.7.4/doc/reference/clutter/html/ClutterMedia.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterMedia.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterMedia.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterMedia - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterModel.html clutter-0.7.4/doc/reference/clutter/html/ClutterModel.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterModel.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterModel.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterModel - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterModelIter.html clutter-0.7.4/doc/reference/clutter/html/ClutterModelIter.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterModelIter.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterModelIter.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterModelIter - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterRectangle.html clutter-0.7.4/doc/reference/clutter/html/ClutterRectangle.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterRectangle.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterRectangle.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterRectangle - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterScore.html clutter-0.7.4/doc/reference/clutter/html/ClutterScore.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterScore.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterScore.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterScore - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterScript.html clutter-0.7.4/doc/reference/clutter/html/ClutterScript.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterScript.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterScript.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterScript - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -78,6 +78,11 @@ guint clutter_script_load_from_file (ClutterScript *script, const gchar *filename, GError **error); +void clutter_script_add_search_paths (ClutterScript *script, + const gchar * const paths[], + gsize n_paths); +gchar* clutter_script_lookup_filename (ClutterScript *script, + const gchar *filename); GObject* clutter_script_get_object (ClutterScript *script, const gchar *name); @@ -461,6 +466,81 @@
+

clutter_script_add_search_paths ()

+
void                clutter_script_add_search_paths     (ClutterScript *script,
+                                                         const gchar * const paths[],
+                                                         gsize n_paths);
+

+Adds paths to the list of search paths held by script. +

+

+The search paths are used by clutter_script_lookup_filename(), which +can be used to define search paths for the textures source file name +or other custom, file-based properties.

+

+ +

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

script :

 a ClutterScript +

paths :

 an array of strings containing different search paths +

n_paths :

 the length of the passed array +
+

Since 0.8 +

+
+
+
+

clutter_script_lookup_filename ()

+
gchar*              clutter_script_lookup_filename      (ClutterScript *script,
+                                                         const gchar *filename);
+

+Looks up filename inside the search paths of script. If filename +is found, its full path will be returned .

+

+ +

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

script :

 a ClutterScript +

filename :

 the name of the file to lookup +

Returns :

 the full path of filename or NULL if no path was + found. + +
+

Since 0.8 +

+
+
+

clutter_script_get_object ()

GObject*            clutter_script_get_object           (ClutterScript *script,
                                                          const gchar *name);
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterShader.html clutter-0.7.4/doc/reference/clutter/html/ClutterShader.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterShader.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterShader.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterShader - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterStage.html clutter-0.7.4/doc/reference/clutter/html/ClutterStage.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterStage.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterStage.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterStage - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterTexture.html clutter-0.7.4/doc/reference/clutter/html/ClutterTexture.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterTexture.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterTexture.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterTexture - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ClutterTimeline.html clutter-0.7.4/doc/reference/clutter/html/ClutterTimeline.html --- clutter-0.7.2/doc/reference/clutter/html/ClutterTimeline.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ClutterTimeline.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterTimeline - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch01.html clutter-0.7.4/doc/reference/clutter/html/ch01.html --- clutter-0.7.2/doc/reference/clutter/html/ch01.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch01.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Abstract classes and interfaces - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Abstract classes and interfaces

+Abstract classes and interfaces
ClutterActor — Base abstract class for all visual stage actors. diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch02.html clutter-0.7.4/doc/reference/clutter/html/ch02.html --- clutter-0.7.2/doc/reference/clutter/html/ch02.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch02.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Base actors - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Base actors

+Base actors
ClutterRectangle — An actor that displays a simple rectangle. diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch03.html clutter-0.7.4/doc/reference/clutter/html/ch03.html --- clutter-0.7.2/doc/reference/clutter/html/ch03.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch03.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Container actors - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Container actors

+Container actors
ClutterGroup — Actor class containing multiple children. diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch04.html clutter-0.7.4/doc/reference/clutter/html/ch04.html --- clutter-0.7.2/doc/reference/clutter/html/ch04.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch04.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Base classes - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Base classes

+Base classes
ClutterTimeline — A class for time-based events diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch05.html clutter-0.7.4/doc/reference/clutter/html/ch05.html --- clutter-0.7.2/doc/reference/clutter/html/ch05.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch05.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Behaviours - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Behaviours

+Behaviours
ClutterBehaviourBspline — A behaviour interpolating position along a B-Spline diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch06.html clutter-0.7.4/doc/reference/clutter/html/ch06.html --- clutter-0.7.2/doc/reference/clutter/html/ch06.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch06.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Simple effects API - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Simple effects API

+Simple effects API
Clutter Effects — Utility Class for basic visual effects
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch07.html clutter-0.7.4/doc/reference/clutter/html/ch07.html --- clutter-0.7.2/doc/reference/clutter/html/ch07.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch07.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ General purpose API - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-General purpose API

+General purpose API
Colors — Color management and manipulation. diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch08.html clutter-0.7.4/doc/reference/clutter/html/ch08.html --- clutter-0.7.2/doc/reference/clutter/html/ch08.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch08.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ User interface definition - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-User interface definition

+User interface definition
ClutterScript — Loads a scene from UI definition data diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ch09.html clutter-0.7.4/doc/reference/clutter/html/ch09.html --- clutter-0.7.2/doc/reference/clutter/html/ch09.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ch09.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Generic list model - + @@ -42,13 +42,13 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

-Generic list model

+Generic list model
ClutterModel — A generic model implementation diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Clutter-Effects.html clutter-0.7.4/doc/reference/clutter/html/clutter-Clutter-Effects.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Clutter-Effects.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Clutter-Effects.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Clutter Effects - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-ClutterBackend.html clutter-0.7.4/doc/reference/clutter/html/clutter-ClutterBackend.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-ClutterBackend.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-ClutterBackend.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterBackend - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -80,6 +80,9 @@ void clutter_backend_set_font_options (ClutterBackend *backend, cairo_font_options_t *options); cairo_font_options_t* clutter_backend_get_font_options (ClutterBackend *backend); +void clutter_backend_get_display_size (ClutterBackend *backend, + gint *width, + gint *height);
@@ -160,7 +163,9 @@ gdouble dpi);

Sets the resolution for font handling on the screen. This is a -scale factor between points specified in a PangoFontDescription +scale factor between points specified in a PangoFontDescription and cairo units. The default value is 96, meaning that a 10 point font will be 13 units high. (10 * 96. / 72. = 13.3).

@@ -368,6 +373,40 @@

Since 0.8

+
+
+

clutter_backend_get_display_size ()

+
void                clutter_backend_get_display_size    (ClutterBackend *backend,
+                                                         gint *width,
+                                                         gint *height);
+

+Retrieves the size of the display from the ClutterBackend.

+

+ +

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

backend :

 a ClutterBackend +

width :

 return location for the display width in pixels, or NULL +

height :

 return location for the display height in pixels, or NULL +
+

Since 0.8 +

+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-ClutterScriptable.html clutter-0.7.4/doc/reference/clutter/html/clutter-ClutterScriptable.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-ClutterScriptable.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-ClutterScriptable.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ ClutterScriptable - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Colors.html clutter-0.7.4/doc/reference/clutter/html/clutter-Colors.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Colors.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Colors.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Colors - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Events.html clutter-0.7.4/doc/reference/clutter/html/clutter-Events.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Events.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Events.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Events - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -102,6 +102,9 @@ guint16 clutter_key_event_code (ClutterKeyEvent *keyev); guint32 clutter_key_event_unicode (ClutterKeyEvent *keyev); guint32 clutter_keysym_to_unicode (guint keyval); + +gint clutter_event_get_device_id (ClutterEvent *event); +ClutterInputDevice* clutter_get_input_device_for_id (gint id);
@@ -1168,6 +1171,57 @@
+
+
+

clutter_event_get_device_id ()

+
gint                clutter_event_get_device_id         (ClutterEvent *event);
+

+Retrieves the events device id if set.

+

+ +

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

event :

 a clutter event +

Returns :

 A unique identifier for the device or -1 if the event has + no specific device set. +
+
+
+
+

clutter_get_input_device_for_id ()

+
ClutterInputDevice* clutter_get_input_device_for_id     (gint id);
+

+ +

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

id :

 +

Returns :

 + + +
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Fixed-Point-Support.html clutter-0.7.4/doc/reference/clutter/html/clutter-Fixed-Point-Support.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Fixed-Point-Support.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Fixed-Point-Support.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Fixed Point Support - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -158,8 +158,8 @@

    -

  • Two fixed point numbers can be directly added and - subtracted.

    • +

  • Two fixed point numbers can be directly added, + subtracted and have their modulus taken.

  • To add other numerical type to a fixed point number it has to be first converted to fixed point.

  • A fixed point number can be directly multiplied or divided by diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-General.html clutter-0.7.4/doc/reference/clutter/html/clutter-General.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-General.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-General.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ General - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -63,6 +63,9 @@

    Synopsis

    +#define             CLUTTER_PRIORITY_REDRAW
+#define             CLUTTER_PRIORITY_TIMELINE
+
 enum                ClutterInitError;
 ClutterInitError    clutter_init                        (int *argc,
                                                          char ***argv);
@@ -127,6 +130,9 @@
 void                clutter_grab_pointer                (ClutterActor *actor);
 void                clutter_ungrab_keyboard             (void);
 void                clutter_ungrab_pointer              (void);
+void                clutter_grab_pointer_for_device     (ClutterActor *actor,
+                                                         gint id);
+void                clutter_ungrab_pointer_for_device   (gint id);
 
 void                clutter_do_event                    (ClutterEvent *event);
    @@ -143,6 +149,32 @@

    Details

    +

    CLUTTER_PRIORITY_REDRAW

    +
    #define CLUTTER_PRIORITY_REDRAW         (G_PRIORITY_DEFAULT + 10)
+
    +

    +Priority of the redraws.

    +

    + +

    +

    Since 0.8 +

    +
    +
    +
    +

    CLUTTER_PRIORITY_TIMELINE

    +
    #define CLUTTER_PRIORITY_TIMELINE       (G_PRIORITY_DEFAULT + 30)
+
    +

    +Priority of the timelines.

    +

    + +

    +

    Since 0.8 +

    +
    +
    +

    enum ClutterInitError

    typedef enum {
   CLUTTER_INIT_SUCCESS        =  1,
@@ -1215,6 +1247,50 @@
    +

    clutter_grab_pointer_for_device ()

    +
    void                clutter_grab_pointer_for_device     (ClutterActor *actor,
+                                                         gint id);
    +

    + +

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

    actor :

    		 +

    id :

    		 + + +
    +
    +
    +
    +

    clutter_ungrab_pointer_for_device ()

    +
    void                clutter_ungrab_pointer_for_device   (gint id);
    +

    + +

    +
    ++ + + + +

    id :

    		 + + +
    +
    +
    +

    clutter_do_event ()

    void                clutter_do_event                    (ClutterEvent *event);

    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Unit-conversion.html clutter-0.7.4/doc/reference/clutter/html/clutter-Unit-conversion.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Unit-conversion.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Unit-conversion.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Unit conversion - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Utilities.html clutter-0.7.4/doc/reference/clutter/html/clutter-Utilities.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Utilities.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Utilities.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Utilities - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Versioning-Macros.html clutter-0.7.4/doc/reference/clutter/html/clutter-Versioning-Macros.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-Versioning-Macros.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-Versioning-Macros.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Versioning Macros - + @@ -43,7 +43,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next @@ -110,7 +110,7 @@

    CLUTTER_MICRO_VERSION

    -
    #define CLUTTER_MICRO_VERSION   (2)
+
    #define CLUTTER_MICRO_VERSION   (4)
 
    
 
    
 The micro version of the Clutter library (3, if CLUTTER_VERSION is 1.2.3)
    
@@ -121,7 +121,7 @@
 
    
 
    
 
    CLUTTER_VERSION
    
-
    #define CLUTTER_VERSION         0.7.2
+
    #define CLUTTER_VERSION         0.7.4
 
    
 
    
 The full version of the Clutter library, like 1.2.3
    
@@ -132,7 +132,7 @@
 
    
 
    
 
    CLUTTER_VERSION_S
    
-
    #define CLUTTER_VERSION_S       "0.7.2"
+
    #define CLUTTER_VERSION_S       "0.7.4"
 
    
 
    
 The full version of the Clutter library, in string form (suited for
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-Win32-Specific-Support.html clutter-0.7.4/doc/reference/clutter/html/clutter-Win32-Specific-Support.html
--- clutter-0.7.2/doc/reference/clutter/html/clutter-Win32-Specific-Support.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/clutter-Win32-Specific-Support.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 Win32 Specific Support
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-X11-Specific-Support.html clutter-0.7.4/doc/reference/clutter/html/clutter-X11-Specific-Support.html
--- clutter-0.7.2/doc/reference/clutter/html/clutter-X11-Specific-Support.html	2008-06-23 17:27:26.000000000 +0100
+++ clutter-0.7.4/doc/reference/clutter/html/clutter-X11-Specific-Support.html	2008-06-25 17:58:29.000000000 +0100
@@ -4,7 +4,7 @@
 
 X11 Specific Support
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 Prev
 Up
 Home
-Clutter 0.7
+Clutter 0.7.4
  Reference Manual
 Next
 
@@ -85,6 +85,14 @@
                                                          gpointer data);
 void                clutter_x11_remove_filter           (ClutterX11FilterFunc func,
                                                          gpointer data);
+
+enum                ClutterX11InputDeviceType;
+                    ClutterX11XInputDevice;
+enum                ClutterX11XInputEventTypes;
+ClutterX11InputDeviceType clutter_x11_get_input_device_type
+                                                        (ClutterX11XInputDevice *device);
+GSList*             clutter_x11_get_input_devices       (void);
+gboolean            clutter_x11_has_xinput              (void);
 
    
 
    
 
    
@@ -517,6 +525,105 @@
 
    Since  0.6
 
    
 
    
+
    
+
    
+
    enum ClutterX11InputDeviceType
    
+
    typedef enum {
+  CLUTTER_X11_XINPUT_POINTER_DEVICE,
+  CLUTTER_X11_XINPUT_KEYBOARD_DEVICE,
+  CLUTTER_X11_XINPUT_EXTENSION_DEVICE
+} ClutterX11InputDeviceType;
+
    
+
    
+
+
    
+
    
+
    
+
    
+
    ClutterX11XInputDevice
    
+
    typedef struct _ClutterX11XInputDevice ClutterX11XInputDevice;
    
+
    
+
+
    
+
    
+
    
+
    
+
    enum ClutterX11XInputEventTypes
    
+
    typedef enum {
+  CLUTTER_X11_XINPUT_KEY_PRESS_EVENT = 0,
+  CLUTTER_X11_XINPUT_KEY_RELEASE_EVENT,
+  CLUTTER_X11_XINPUT_BUTTON_PRESS_EVENT,
+  CLUTTER_X11_XINPUT_BUTTON_RELEASE_EVENT,
+  CLUTTER_X11_XINPUT_MOTION_NOTIFY_EVENT,
+  CLUTTER_X11_XINPUT_LAST_EVENT
+} ClutterX11XInputEventTypes;
+
    
+
    
+
+
    
+
    
+
    
+
    
+
    clutter_x11_get_input_device_type ()
    
+
    ClutterX11InputDeviceType clutter_x11_get_input_device_type
+                                                        (ClutterX11XInputDevice *device);
    
+
    
+
+
    
+
    
++
+
+
+
+
+
+
+
+
+
+
    

    device :
    		
+
    Returns :
    		
+
+
+
    
+
    
+
    
+
    
+
    clutter_x11_get_input_devices ()
    
+
    GSList*             clutter_x11_get_input_devices       (void);
    
+
    
+
+
    
+
    
++
+
+
+
+
    

    Returns :
    		
+
+
+
    
+
    
+
    
+
    
+
    clutter_x11_has_xinput ()
    
+
    gboolean            clutter_x11_has_xinput              (void);
    
+
    
+
+
    
+
    
++
+
+
+
+
    

    Returns :
    		
+
+
+
    
+
    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-animation-behaviours.html clutter-0.7.4/doc/reference/clutter/html/clutter-animation-behaviours.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-animation-behaviours.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-animation-behaviours.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Behaviours - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-animation-conclusion.html clutter-0.7.4/doc/reference/clutter/html/clutter-animation-conclusion.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-animation-conclusion.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-animation-conclusion.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Conclusion - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-animation-effects.html clutter-0.7.4/doc/reference/clutter/html/clutter-animation-effects.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-animation-effects.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-animation-effects.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Effects - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-animation-timelines.html clutter-0.7.4/doc/reference/clutter/html/clutter-animation-timelines.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-animation-timelines.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-animation-timelines.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Timelines - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-animations.html clutter-0.7.4/doc/reference/clutter/html/clutter-animations.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-animations.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-animations.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Creating Animations with Clutter - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter-subclassing-ClutterActor.html clutter-0.7.4/doc/reference/clutter/html/clutter-subclassing-ClutterActor.html --- clutter-0.7.2/doc/reference/clutter/html/clutter-subclassing-ClutterActor.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter-subclassing-ClutterActor.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Implementing a new actor - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter.devhelp clutter-0.7.4/doc/reference/clutter/html/clutter.devhelp --- clutter-0.7.2/doc/reference/clutter/html/clutter.devhelp 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter.devhelp 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,6 @@ - + @@ -117,6 +117,7 @@ + @@ -815,6 +816,8 @@ + + @@ -877,6 +880,8 @@ + + @@ -913,6 +918,8 @@ + + @@ -982,6 +989,8 @@ + + @@ -1063,6 +1072,7 @@ + @@ -1079,6 +1089,12 @@ + + + + + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter.devhelp2 clutter-0.7.4/doc/reference/clutter/html/clutter.devhelp2 --- clutter-0.7.2/doc/reference/clutter/html/clutter.devhelp2 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter.devhelp2 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,6 @@ - + @@ -117,6 +117,7 @@ + @@ -815,6 +816,8 @@ + + @@ -877,6 +880,8 @@ + + @@ -913,6 +918,8 @@ + + @@ -982,6 +989,8 @@ + + @@ -1063,6 +1072,7 @@ + @@ -1079,6 +1089,12 @@ + + + + + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutter.html clutter-0.7.4/doc/reference/clutter/html/clutter.html --- clutter-0.7.2/doc/reference/clutter/html/clutter.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutter.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,9 +4,9 @@ Part I. Clutter Overview - - - + + + @@ -42,7 +42,7 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutteranimation.html clutter-0.7.4/doc/reference/clutter/html/clutteranimation.html --- clutter-0.7.2/doc/reference/clutter/html/clutteranimation.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutteranimation.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Part IV. Clutter Animation Framework - - + + @@ -42,7 +42,7 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutterbase.html clutter-0.7.4/doc/reference/clutter/html/clutterbase.html --- clutter-0.7.2/doc/reference/clutter/html/clutterbase.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutterbase.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Part III. Clutter Core Reference - - + + @@ -42,7 +42,7 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/clutterbuilding.html clutter-0.7.4/doc/reference/clutter/html/clutterbuilding.html --- clutter-0.7.2/doc/reference/clutter/html/clutterbuilding.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/clutterbuilding.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Part II. Building Clutter - - + + @@ -42,7 +42,7 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/creating-your-own-behaviours.html clutter-0.7.4/doc/reference/clutter/html/creating-your-own-behaviours.html --- clutter-0.7.2/doc/reference/clutter/html/creating-your-own-behaviours.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/creating-your-own-behaviours.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Creating You Own Behaviours - + @@ -42,7 +42,7 @@ Prev Up Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/index.html clutter-0.7.4/doc/reference/clutter/html/index.html --- clutter-0.7.2/doc/reference/clutter/html/index.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/index.html 2008-06-25 17:58:29.000000000 +0100 @@ -2,9 +2,9 @@ -Clutter 0.7 Reference Manual +Clutter 0.7.4 Reference Manual - + @@ -39,13 +39,13 @@
    -
    -

    -Index

    +Index

    C

    @@ -656,8 +656,16 @@
    ClutterX11FilterReturn, enum ClutterX11FilterReturn
    +
    ClutterX11InputDeviceType, enum ClutterX11InputDeviceType +
    +
    ClutterX11XInputDevice, ClutterX11XInputDevice +
    +
    ClutterX11XInputEventTypes, enum ClutterX11XInputEventTypes +
    clutter_actor_allocate, clutter_actor_allocate ()
    +
    clutter_actor_allocate_preferred_size, clutter_actor_allocate_preferred_size () +
    clutter_actor_apply_relative_transform_to_point, clutter_actor_apply_relative_transform_to_point ()
    clutter_actor_apply_transform_to_point, clutter_actor_apply_transform_to_point () @@ -946,6 +954,8 @@
    clutter_atani, clutter_atani ()
    +
    clutter_backend_get_display_size, clutter_backend_get_display_size () +
    clutter_backend_get_double_click_distance, clutter_backend_get_double_click_distance ()
    clutter_backend_get_double_click_time, clutter_backend_get_double_click_time () @@ -1304,6 +1314,8 @@
    clutter_event_get_coords, clutter_event_get_coords ()
    +
    clutter_event_get_device_id, clutter_event_get_device_id () +
    clutter_event_get_source, clutter_event_get_source ()
    clutter_event_get_stage, clutter_event_get_stage () @@ -1362,6 +1374,8 @@
    clutter_get_default_frame_rate, clutter_get_default_frame_rate ()
    +
    clutter_get_input_device_for_id, clutter_get_input_device_for_id () +
    clutter_get_keyboard_grab, clutter_get_keyboard_grab ()
    clutter_get_motion_events_enabled, clutter_get_motion_events_enabled () @@ -1384,6 +1398,8 @@
    clutter_grab_pointer, clutter_grab_pointer ()
    +
    clutter_grab_pointer_for_device, clutter_grab_pointer_for_device () +
    clutter_group_add_many, clutter_group_add_many ()
    clutter_group_add_many_valist, clutter_group_add_many_valist () @@ -1610,6 +1626,10 @@
    CLUTTER_PRIORITY_EVENTS, CLUTTER_PRIORITY_EVENTS
    +
    CLUTTER_PRIORITY_REDRAW, CLUTTER_PRIORITY_REDRAW +
    +
    CLUTTER_PRIORITY_TIMELINE, CLUTTER_PRIORITY_TIMELINE +
    clutter_qdivx, clutter_qdivx ()
    clutter_qmulx, clutter_qmulx () @@ -1672,6 +1692,8 @@
    clutter_scriptable_set_id, clutter_scriptable_set_id ()
    +
    clutter_script_add_search_paths, clutter_script_add_search_paths () +
    clutter_script_connect_signals, clutter_script_connect_signals ()
    clutter_script_connect_signals_full, clutter_script_connect_signals_full () @@ -1688,6 +1710,8 @@
    clutter_script_load_from_file, clutter_script_load_from_file ()
    +
    clutter_script_lookup_filename, clutter_script_lookup_filename () +
    clutter_script_new, clutter_script_new ()
    clutter_script_unmerge_objects, clutter_script_unmerge_objects () @@ -1944,6 +1968,8 @@
    clutter_ungrab_pointer, clutter_ungrab_pointer ()
    +
    clutter_ungrab_pointer_for_device, clutter_ungrab_pointer_for_device () +
    CLUTTER_UNITS_FROM_DEVICE, CLUTTER_UNITS_FROM_DEVICE()
    CLUTTER_UNITS_FROM_FIXED, CLUTTER_UNITS_FROM_FIXED() @@ -2020,6 +2046,10 @@
    clutter_x11_get_default_screen, clutter_x11_get_default_screen ()
    +
    clutter_x11_get_input_devices, clutter_x11_get_input_devices () +
    +
    clutter_x11_get_input_device_type, clutter_x11_get_input_device_type () +
    clutter_x11_get_root_window, clutter_x11_get_root_window ()
    clutter_x11_get_stage_from_window, clutter_x11_get_stage_from_window () @@ -2030,6 +2060,8 @@
    clutter_x11_handle_event, clutter_x11_handle_event ()
    +
    clutter_x11_has_xinput, clutter_x11_has_xinput () +
    clutter_x11_remove_filter, clutter_x11_remove_filter ()
    clutter_x11_set_display, clutter_x11_set_display () diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ix02.html clutter-0.7.4/doc/reference/clutter/html/ix02.html --- clutter-0.7.2/doc/reference/clutter/html/ix02.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ix02.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Index of deprecated symbols - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Index of deprecated symbols

    +Index of deprecated symbols

    C

    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ix03.html clutter-0.7.4/doc/reference/clutter/html/ix03.html --- clutter-0.7.2/doc/reference/clutter/html/ix03.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ix03.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Index of new symbols in 0.2 - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Index of new symbols in 0.2

    +Index of new symbols in 0.2

    C

    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ix04.html clutter-0.7.4/doc/reference/clutter/html/ix04.html --- clutter-0.7.2/doc/reference/clutter/html/ix04.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ix04.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Index of new symbols in 0.4 - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Index of new symbols in 0.4

    +Index of new symbols in 0.4

    C

    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ix05.html clutter-0.7.4/doc/reference/clutter/html/ix05.html --- clutter-0.7.2/doc/reference/clutter/html/ix05.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ix05.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Index of new symbols in 0.6 - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Index of new symbols in 0.6

    +Index of new symbols in 0.6

    C

    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/ix06.html clutter-0.7.4/doc/reference/clutter/html/ix06.html --- clutter-0.7.2/doc/reference/clutter/html/ix06.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/ix06.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Index of new symbols in 0.8 - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Index of new symbols in 0.8

    +Index of new symbols in 0.8

    C

    @@ -104,6 +104,8 @@
    clutter_actor_allocate, clutter_actor_allocate ()
    +
    clutter_actor_allocate_preferred_size, clutter_actor_allocate_preferred_size () +
    clutter_actor_get_allocation_box, clutter_actor_get_allocation_box ()
    clutter_actor_get_allocation_coords, clutter_actor_get_allocation_coords () @@ -140,6 +142,8 @@
    clutter_alpha_set_closure, clutter_alpha_set_closure ()
    +
    clutter_backend_get_display_size, clutter_backend_get_display_size () +
    clutter_backend_get_font_options, clutter_backend_get_font_options ()
    clutter_backend_set_font_options, clutter_backend_set_font_options () @@ -186,8 +190,16 @@
    clutter_param_spec_unit, clutter_param_spec_unit ()
    +
    CLUTTER_PRIORITY_REDRAW, CLUTTER_PRIORITY_REDRAW +
    +
    CLUTTER_PRIORITY_TIMELINE, CLUTTER_PRIORITY_TIMELINE +
    clutter_score_append_at_marker, clutter_score_append_at_marker ()
    +
    clutter_script_add_search_paths, clutter_script_add_search_paths () +
    +
    clutter_script_lookup_filename, clutter_script_lookup_filename () +
    clutter_set_use_mipmapped_text, clutter_set_use_mipmapped_text ()
    clutter_shader_compile, clutter_shader_compile () diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/license.html clutter-0.7.4/doc/reference/clutter/html/license.html --- clutter-0.7.2/doc/reference/clutter/html/license.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/license.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Appendix A. License - - + + @@ -41,7 +41,7 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual   diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/pt05.html clutter-0.7.4/doc/reference/clutter/html/pt05.html --- clutter-0.7.2/doc/reference/clutter/html/pt05.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/pt05.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Part V. Clutter Tools - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Part V. Clutter Tools

    +Part V. Clutter Tools

    Table of Contents

    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/pt06.html clutter-0.7.4/doc/reference/clutter/html/pt06.html --- clutter-0.7.2/doc/reference/clutter/html/pt06.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/pt06.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Part VI. Clutter Backends - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Part VI. Clutter Backends

    +Part VI. Clutter Backends

    Clutter is usually compiled against a specific drawing backend. diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/html/pt07.html clutter-0.7.4/doc/reference/clutter/html/pt07.html --- clutter-0.7.2/doc/reference/clutter/html/pt07.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/html/pt07.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,8 +4,8 @@ Part VII. Additional Documentation - - + + @@ -42,13 +42,13 @@ Prev   Home -Clutter 0.7 +Clutter 0.7.4 Reference Manual Next

    -Part VII. Additional Documentation

    +Part VII. Additional Documentation

    This section contains additional useful documentation for diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-actor.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-actor.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-actor.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-actor.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + @@ -607,6 +609,15 @@ @absolute_origin_changed: + + + + + +@self: +@absolute_origin_changed: + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-alpha.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-alpha.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-alpha.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-alpha.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-backend.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-backend.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-backend.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-backend.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + @@ -97,3 +99,13 @@ @Returns: + + + + + +@backend: +@width: +@height: + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-bspline.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-bspline.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-bspline.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-bspline.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-depth.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-depth.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-depth.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-depth.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-ellipse.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-ellipse.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-ellipse.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-ellipse.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-opacity.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-opacity.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-opacity.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-opacity.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-path.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-path.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-path.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-path.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-rotate.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-rotate.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-rotate.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-rotate.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-scale.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-scale.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour-scale.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour-scale.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-behaviour.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-behaviour.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-child-meta.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-child-meta.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-child-meta.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-child-meta.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-clone-texture.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-clone-texture.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-clone-texture.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-clone-texture.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-color.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-color.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-color.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-color.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-container.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-container.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-container.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-container.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-effect.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-effect.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-effect.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-effect.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-entry.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-entry.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-entry.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-entry.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-event.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-event.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-event.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-event.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + @@ -358,3 +360,21 @@ @Returns: + + + + + +@event: +@Returns: + + + + + + + +@id: +@Returns: + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-feature.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-feature.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-feature.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-feature.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-fixed.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-fixed.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-fixed.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-fixed.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-group.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-group.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-group.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-group.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-label.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-label.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-label.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-label.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-list-model.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-list-model.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-list-model.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-list-model.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-main.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-main.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-main.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-main.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,14 +9,30 @@ + + + + + + + + + + + + + + + + @@ -332,6 +348,23 @@ + + + + + +@actor: +@id: + + + + + + + +@id: + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-media.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-media.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-media.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-media.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-model-iter.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-model-iter.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-model-iter.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-model-iter.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-model.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-model.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-model.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-model.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-rectangle.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-rectangle.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-rectangle.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-rectangle.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-score.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-score.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-score.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-score.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-script.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-script.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-script.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-script.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + @@ -80,6 +82,26 @@ @Returns: + + + + + +@script: +@paths: +@n_paths: + + + + + + + +@script: +@filename: +@Returns: + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-scriptable.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-scriptable.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-scriptable.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-scriptable.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-shader.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-shader.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-shader.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-shader.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-stage.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-stage.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-stage.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-stage.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-texture.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-texture.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-texture.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-texture.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-timeline.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-timeline.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-timeline.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-timeline.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-units.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-units.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-units.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-units.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-unused.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-unused.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-unused.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-unused.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -1,15 +0,0 @@ - - - - - -@clutteractor: the object which received the signal. - - - - - - -@self: -@box: - diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-util.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-util.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-util.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-util.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-version.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-version.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-version.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-version.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-win32.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-win32.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-win32.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-win32.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/tmpl/clutter-x11.sgml clutter-0.7.4/doc/reference/clutter/tmpl/clutter-x11.sgml --- clutter-0.7.2/doc/reference/clutter/tmpl/clutter-x11.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/tmpl/clutter-x11.sgml 2008-06-25 17:58:28.000000000 +0100 @@ -9,11 +9,13 @@ + + @@ -155,3 +157,55 @@ @data: + + + + + +@CLUTTER_X11_XINPUT_POINTER_DEVICE: +@CLUTTER_X11_XINPUT_KEYBOARD_DEVICE: +@CLUTTER_X11_XINPUT_EXTENSION_DEVICE: + + + + + + + + + + + + +@CLUTTER_X11_XINPUT_KEY_PRESS_EVENT: +@CLUTTER_X11_XINPUT_KEY_RELEASE_EVENT: +@CLUTTER_X11_XINPUT_BUTTON_PRESS_EVENT: +@CLUTTER_X11_XINPUT_BUTTON_RELEASE_EVENT: +@CLUTTER_X11_XINPUT_MOTION_NOTIFY_EVENT: +@CLUTTER_X11_XINPUT_LAST_EVENT: + + + + + + +@device: +@Returns: + + + + + + + +@Returns: + + + + + + + +@Returns: + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/version.xml clutter-0.7.4/doc/reference/clutter/version.xml --- clutter-0.7.2/doc/reference/clutter/version.xml 2008-06-23 17:12:56.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/version.xml 2008-06-25 17:49:45.000000000 +0100 @@ -1 +1 @@ -0.7 +0.7.4 diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/version.xml.in clutter-0.7.4/doc/reference/clutter/version.xml.in --- clutter-0.7.2/doc/reference/clutter/version.xml.in 2008-06-10 13:20:22.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/version.xml.in 2008-06-25 17:25:16.000000000 +0100 @@ -1 +1 @@ -@CLUTTER_MAJORMINOR@ +@CLUTTER_VERSION@ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-actor.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-actor.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-actor.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-actor.xml 2008-06-25 17:58:28.000000000 +0100 @@ -60,6 +60,9 @@ void clutter_actor_allocate (ClutterActor *self, const ClutterActorBox *box, gboolean absolute_origin_changed); +void clutter_actor_allocate_preferred_size + (ClutterActor *self, + gboolean absolute_origin_changed); void clutter_actor_get_allocation_coords (ClutterActor *self, gint *x_1, gint *y_1, @@ -1282,6 +1285,38 @@ Since 0.8 + +clutter_actor_allocate_preferred_size () +clutter_actor_allocate_preferred_sizevoid clutter_actor_allocate_preferred_size + (ClutterActor *self, + gboolean absolute_origin_changed); + +Allocates the natural size of self. + + +This function is a utility call for ClutterActor implementations +that allocates the actor's preferred natural size. It can be used +by fixed layout managers (like ClutterGroup or so called +'composite actors') inside the ClutterActor::allocate +implementation to give each child exactly how much space it +requires. + + +This function is not meant to be used by applications. It is also +not meant to be used outside the implementation of the +ClutterActor::allocate virtual function. + + + +self : + a ClutterActor + +absolute_origin_changed : + whether the position of the parent has + changed in stage coordinates + +Since 0.8 + clutter_actor_get_allocation_coords () clutter_actor_get_allocation_coordsvoid clutter_actor_get_allocation_coords (ClutterActor *self, diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-backend.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-backend.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-backend.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-backend.xml 2008-06-25 17:58:28.000000000 +0100 @@ -41,6 +41,9 @@ void clutter_backend_set_font_options (ClutterBackend *backend, cairo_font_options_t *options); cairo_font_options_t* clutter_backend_get_font_options (ClutterBackend *backend); +void clutter_backend_get_display_size (ClutterBackend *backend, + gint *width, + gint *height); @@ -240,6 +243,27 @@ Since 0.8 + +clutter_backend_get_display_size () +clutter_backend_get_display_sizevoid clutter_backend_get_display_size (ClutterBackend *backend, + gint *width, + gint *height); + +Retrieves the size of the display from the ClutterBackend. + + + +backend : + a ClutterBackend + +width : + return location for the display width in pixels, or NULL + +height : + return location for the display height in pixels, or NULL + +Since 0.8 + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-event.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-event.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-event.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-event.xml 2008-06-25 17:58:28.000000000 +0100 @@ -63,6 +63,9 @@ guint16 clutter_key_event_code (ClutterKeyEvent *keyev); guint32 clutter_key_event_unicode (ClutterKeyEvent *keyev); guint32 clutter_keysym_to_unicode (guint keyval); + +gint clutter_event_get_device_id (ClutterEvent *event); +ClutterInputDevice* clutter_get_input_device_for_id (gint id); @@ -888,6 +891,35 @@ is no corresponding character. + +clutter_event_get_device_id () +clutter_event_get_device_idgint clutter_event_get_device_id (ClutterEvent *event); + +Retrieves the events device id if set. + + + +event : + a clutter event + +Returns : A unique identifier for the device or -1 if the event has + no specific device set. + + + +clutter_get_input_device_for_id () +clutter_get_input_device_for_idClutterInputDevice* clutter_get_input_device_for_id (gint id); + + + +id : + + +Returns : + + + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-fixed.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-fixed.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-fixed.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-fixed.xml 2008-06-25 17:58:28.000000000 +0100 @@ -128,8 +128,8 @@ - Two fixed point numbers can be directly added and - subtracted. + Two fixed point numbers can be directly added, + subtracted and have their modulus taken. To add other numerical type to a fixed point number it has to diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-main.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-main.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-main.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-main.xml 2008-06-25 17:58:28.000000000 +0100 @@ -24,6 +24,9 @@ Synopsis +#define CLUTTER_PRIORITY_REDRAW +#define CLUTTER_PRIORITY_TIMELINE + enum ClutterInitError; ClutterInitError clutter_init (int *argc, char ***argv); @@ -88,6 +91,9 @@ void clutter_grab_pointer (ClutterActor *actor); void clutter_ungrab_keyboard (void); void clutter_ungrab_pointer (void); +void clutter_grab_pointer_for_device (ClutterActor *actor, + gint id); +void clutter_ungrab_pointer_for_device (gint id); void clutter_do_event (ClutterEvent *event); @@ -113,6 +119,26 @@ Details + +CLUTTER_PRIORITY_REDRAW +CLUTTER_PRIORITY_REDRAW#define CLUTTER_PRIORITY_REDRAW (G_PRIORITY_DEFAULT + 10) + + +Priority of the redraws. + + +Since 0.8 + + +CLUTTER_PRIORITY_TIMELINE +CLUTTER_PRIORITY_TIMELINE#define CLUTTER_PRIORITY_TIMELINE (G_PRIORITY_DEFAULT + 30) + + +Priority of the timelines. + + +Since 0.8 + enum ClutterInitError ClutterInitErrortypedef enum { @@ -867,6 +893,34 @@ Since 0.6 + +clutter_grab_pointer_for_device () +clutter_grab_pointer_for_devicevoid clutter_grab_pointer_for_device (ClutterActor *actor, + gint id); + + + +actor : + + +id : + + + + + + +clutter_ungrab_pointer_for_device () +clutter_ungrab_pointer_for_devicevoid clutter_ungrab_pointer_for_device (gint id); + + + +id : + + + + + clutter_do_event () clutter_do_eventvoid clutter_do_event (ClutterEvent *event); diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-script.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-script.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-script.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-script.xml 2008-06-25 17:58:28.000000000 +0100 @@ -35,6 +35,11 @@ guint clutter_script_load_from_file (ClutterScript *script, const gchar *filename, GError **error); +void clutter_script_add_search_paths (ClutterScript *script, + const gchar * const paths[], + gsize n_paths); +gchar* clutter_script_lookup_filename (ClutterScript *script, + const gchar *filename); GObject* clutter_script_get_object (ClutterScript *script, const gchar *name); @@ -363,6 +368,54 @@ Since 0.6 + +clutter_script_add_search_paths () +clutter_script_add_search_pathsvoid clutter_script_add_search_paths (ClutterScript *script, + const gchar * const paths[], + gsize n_paths); + +Adds paths to the list of search paths held by script. + + +The search paths are used by clutter_script_lookup_filename(), which +can be used to define search paths for the textures source file name +or other custom, file-based properties. + + + +script : + a ClutterScript + +paths : + an array of strings containing different search paths + +n_paths : + the length of the passed array + +Since 0.8 + + +clutter_script_lookup_filename () +clutter_script_lookup_filenamegchar* clutter_script_lookup_filename (ClutterScript *script, + const gchar *filename); + +Looks up filename inside the search paths of script. If filename +is found, its full path will be returned . + + + +script : + a ClutterScript + +filename : + the name of the file to lookup + +Returns : the full path of filename or NULL if no path was + found. + + +Since 0.8 + clutter_script_get_object () clutter_script_get_objectGObject* clutter_script_get_object (ClutterScript *script, diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-version.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-version.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-version.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-version.xml 2008-06-25 17:58:28.000000000 +0100 @@ -77,7 +77,7 @@ CLUTTER_MICRO_VERSION -CLUTTER_MICRO_VERSION#define CLUTTER_MICRO_VERSION (2) +CLUTTER_MICRO_VERSION#define CLUTTER_MICRO_VERSION (4) The micro version of the Clutter library (3, if CLUTTER_VERSION is 1.2.3) @@ -86,7 +86,7 @@ CLUTTER_VERSION -CLUTTER_VERSION#define CLUTTER_VERSION 0.7.2 +CLUTTER_VERSION#define CLUTTER_VERSION 0.7.4 The full version of the Clutter library, like 1.2.3 @@ -95,7 +95,7 @@ CLUTTER_VERSION_S -CLUTTER_VERSION_S#define CLUTTER_VERSION_S "0.7.2" +CLUTTER_VERSION_S#define CLUTTER_VERSION_S "0.7.4" The full version of the Clutter library, in string form (suited for diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/clutter/xml/clutter-x11.xml clutter-0.7.4/doc/reference/clutter/xml/clutter-x11.xml --- clutter-0.7.2/doc/reference/clutter/xml/clutter-x11.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/clutter/xml/clutter-x11.xml 2008-06-25 17:58:28.000000000 +0100 @@ -46,6 +46,14 @@ gpointer data); void clutter_x11_remove_filter (ClutterX11FilterFunc func, gpointer data); + +enum ClutterX11InputDeviceType; + ClutterX11XInputDevice; +enum ClutterX11XInputEventTypes; +ClutterX11InputDeviceType clutter_x11_get_input_device_type + (ClutterX11XInputDevice *device); +GSList* clutter_x11_get_input_devices (void); +gboolean clutter_x11_has_xinput (void); @@ -337,6 +345,74 @@ Since 0.6 + +enum ClutterX11InputDeviceType +ClutterX11InputDeviceTypetypedef enum { + CLUTTER_X11_XINPUT_POINTER_DEVICE, + CLUTTER_X11_XINPUT_KEYBOARD_DEVICE, + CLUTTER_X11_XINPUT_EXTENSION_DEVICE +} ClutterX11InputDeviceType; + + + + + +ClutterX11XInputDevice +ClutterX11XInputDevicetypedef struct _ClutterX11XInputDevice ClutterX11XInputDevice; + + + + +enum ClutterX11XInputEventTypes +ClutterX11XInputEventTypestypedef enum { + CLUTTER_X11_XINPUT_KEY_PRESS_EVENT = 0, + CLUTTER_X11_XINPUT_KEY_RELEASE_EVENT, + CLUTTER_X11_XINPUT_BUTTON_PRESS_EVENT, + CLUTTER_X11_XINPUT_BUTTON_RELEASE_EVENT, + CLUTTER_X11_XINPUT_MOTION_NOTIFY_EVENT, + CLUTTER_X11_XINPUT_LAST_EVENT +} ClutterX11XInputEventTypes; + + + + + +clutter_x11_get_input_device_type () +clutter_x11_get_input_device_typeClutterX11InputDeviceType clutter_x11_get_input_device_type + (ClutterX11XInputDevice *device); + + + +device : + + +Returns : + + + + + +clutter_x11_get_input_devices () +clutter_x11_get_input_devicesGSList* clutter_x11_get_input_devices (void); + + + +Returns : + + + + + +clutter_x11_has_xinput () +clutter_x11_has_xinputgboolean clutter_x11_has_xinput (void); + + + +Returns : + + + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/Makefile.am clutter-0.7.4/doc/reference/cogl/Makefile.am --- clutter-0.7.2/doc/reference/cogl/Makefile.am 2008-06-12 18:09:32.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/Makefile.am 2008-06-25 17:25:16.000000000 +0100 @@ -71,7 +71,7 @@ # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files= +content_files= version.xml # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files @@ -92,4 +92,4 @@ # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -#EXTRA_DIST += +EXTRA_DIST += version.xml.in diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/Makefile.in clutter-0.7.4/doc/reference/cogl/Makefile.in --- clutter-0.7.2/doc/reference/cogl/Makefile.in 2008-06-23 17:11:38.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/Makefile.in 2008-06-25 17:49:37.000000000 +0100 @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make + $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = doc/reference/cogl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -46,7 +46,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = version.xml SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -291,7 +291,7 @@ # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = +content_files = version.xml # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files @@ -317,13 +317,14 @@ # GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt +# 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 \ + version.xml.in DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp @@ -372,6 +373,8 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -633,12 +636,6 @@ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs - -# This includes the standard gtk-doc make rules, copied by gtkdocize. - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -#EXTRA_DIST += # 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 -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/cogl-docs.sgml clutter-0.7.4/doc/reference/cogl/cogl-docs.sgml --- clutter-0.7.2/doc/reference/cogl/cogl-docs.sgml 2008-06-16 22:18:19.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/cogl-docs.sgml 2008-06-25 17:25:16.000000000 +0100 @@ -1,11 +1,13 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> + - COGL Reference Manual - - + COGL &version; Reference Manual + Version &version; 2008 diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/ch01.html clutter-0.7.4/doc/reference/cogl/html/ch01.html --- clutter-0.7.2/doc/reference/cogl/html/ch01.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/ch01.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,9 +4,9 @@ COGL - GL Abstraction API - - - + + + @@ -17,12 +17,13 @@ Prev   Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual Next

    -COGL - GL Abstraction API

    +COGL - GL Abstraction API
    About COGL
    diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl-General-API.html clutter-0.7.4/doc/reference/cogl/html/cogl-General-API.html --- clutter-0.7.2/doc/reference/cogl/html/cogl-General-API.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl-General-API.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ General API - + @@ -18,7 +18,8 @@ Prev Up Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual Next Top diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl-Offscreen-Buffers.html clutter-0.7.4/doc/reference/cogl/html/cogl-Offscreen-Buffers.html --- clutter-0.7.2/doc/reference/cogl/html/cogl-Offscreen-Buffers.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl-Offscreen-Buffers.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Offscreen Buffers - + @@ -17,7 +17,8 @@ Prev Up Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual   Top diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl-Primitives.html clutter-0.7.4/doc/reference/cogl/html/cogl-Primitives.html --- clutter-0.7.2/doc/reference/cogl/html/cogl-Primitives.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl-Primitives.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Primitives - + @@ -18,7 +18,8 @@ Prev Up Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual Next Top diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html clutter-0.7.4/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html --- clutter-0.7.2/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Shaders and Programmable Pipeline - + @@ -18,7 +18,8 @@ Prev Up Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual Next Top diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl-Textures.html clutter-0.7.4/doc/reference/cogl/html/cogl-Textures.html --- clutter-0.7.2/doc/reference/cogl/html/cogl-Textures.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl-Textures.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Textures - + @@ -18,7 +18,8 @@ Prev Up Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual Next Top diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl-Utility-API.html clutter-0.7.4/doc/reference/cogl/html/cogl-Utility-API.html --- clutter-0.7.2/doc/reference/cogl/html/cogl-Utility-API.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl-Utility-API.html 2008-06-25 17:58:29.000000000 +0100 @@ -4,7 +4,7 @@ Utility API - + @@ -18,7 +18,8 @@ Prev Up Home -COGL Reference Manual +COGL 0.7.4 + Reference Manual Next Top diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl.devhelp clutter-0.7.4/doc/reference/cogl/html/cogl.devhelp --- clutter-0.7.2/doc/reference/cogl/html/cogl.devhelp 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl.devhelp 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,6 @@ - + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/cogl.devhelp2 clutter-0.7.4/doc/reference/cogl/html/cogl.devhelp2 --- clutter-0.7.2/doc/reference/cogl/html/cogl.devhelp2 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/cogl.devhelp2 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,6 @@ - + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/html/index.html clutter-0.7.4/doc/reference/cogl/html/index.html --- clutter-0.7.2/doc/reference/cogl/html/index.html 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/html/index.html 2008-06-25 17:58:29.000000000 +0100 @@ -2,9 +2,9 @@ -COGL Reference Manual +COGL 0.7.4 Reference Manual - + @@ -14,12 +14,13 @@
    -
    -

    -

    +
    +

    Version 0.7.4 +

    Copyright © 2008 OpenedHand LTD

    -

    +

    Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/tmpl/cogl-offscreen.sgml clutter-0.7.4/doc/reference/cogl/tmpl/cogl-offscreen.sgml --- clutter-0.7.2/doc/reference/cogl/tmpl/cogl-offscreen.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/tmpl/cogl-offscreen.sgml 2008-06-25 17:58:29.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/tmpl/cogl-primitives.sgml clutter-0.7.4/doc/reference/cogl/tmpl/cogl-primitives.sgml --- clutter-0.7.2/doc/reference/cogl/tmpl/cogl-primitives.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/tmpl/cogl-primitives.sgml 2008-06-25 17:58:29.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/tmpl/cogl-shaders.sgml clutter-0.7.4/doc/reference/cogl/tmpl/cogl-shaders.sgml --- clutter-0.7.2/doc/reference/cogl/tmpl/cogl-shaders.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/tmpl/cogl-shaders.sgml 2008-06-25 17:58:29.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/tmpl/cogl-texture.sgml clutter-0.7.4/doc/reference/cogl/tmpl/cogl-texture.sgml --- clutter-0.7.2/doc/reference/cogl/tmpl/cogl-texture.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/tmpl/cogl-texture.sgml 2008-06-25 17:58:29.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/tmpl/cogl-util.sgml clutter-0.7.4/doc/reference/cogl/tmpl/cogl-util.sgml --- clutter-0.7.2/doc/reference/cogl/tmpl/cogl-util.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/tmpl/cogl-util.sgml 2008-06-25 17:58:29.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/tmpl/cogl.sgml clutter-0.7.4/doc/reference/cogl/tmpl/cogl.sgml --- clutter-0.7.2/doc/reference/cogl/tmpl/cogl.sgml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/tmpl/cogl.sgml 2008-06-25 17:58:29.000000000 +0100 @@ -9,11 +9,13 @@ + + diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/version.xml clutter-0.7.4/doc/reference/cogl/version.xml --- clutter-0.7.2/doc/reference/cogl/version.xml 1970-01-01 01:00:00.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/version.xml 2008-06-25 17:49:45.000000000 +0100 @@ -0,0 +1 @@ +0.7.4 diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/version.xml.in clutter-0.7.4/doc/reference/cogl/version.xml.in --- clutter-0.7.2/doc/reference/cogl/version.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/version.xml.in 2008-06-25 17:25:16.000000000 +0100 @@ -0,0 +1 @@ +@CLUTTER_VERSION@ diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/xml/cogl-offscreen.xml clutter-0.7.4/doc/reference/cogl/xml/cogl-offscreen.xml --- clutter-0.7.2/doc/reference/cogl/xml/cogl-offscreen.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/xml/cogl-offscreen.xml 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> Offscreen Buffers diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/xml/cogl-primitives.xml clutter-0.7.4/doc/reference/cogl/xml/cogl-primitives.xml --- clutter-0.7.2/doc/reference/cogl/xml/cogl-primitives.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/xml/cogl-primitives.xml 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> Primitives diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/xml/cogl-shaders.xml clutter-0.7.4/doc/reference/cogl/xml/cogl-shaders.xml --- clutter-0.7.2/doc/reference/cogl/xml/cogl-shaders.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/xml/cogl-shaders.xml 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> Shaders and Programmable Pipeline diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/xml/cogl-texture.xml clutter-0.7.4/doc/reference/cogl/xml/cogl-texture.xml --- clutter-0.7.2/doc/reference/cogl/xml/cogl-texture.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/xml/cogl-texture.xml 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> Textures diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/xml/cogl-util.xml clutter-0.7.4/doc/reference/cogl/xml/cogl-util.xml --- clutter-0.7.2/doc/reference/cogl/xml/cogl-util.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/xml/cogl-util.xml 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> Utility API diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal clutter-0.7.2/doc/reference/cogl/xml/cogl.xml clutter-0.7.4/doc/reference/cogl/xml/cogl.xml --- clutter-0.7.2/doc/reference/cogl/xml/cogl.xml 2008-06-23 17:27:26.000000000 +0100 +++ clutter-0.7.4/doc/reference/cogl/xml/cogl.xml 2008-06-25 17:58:29.000000000 +0100 @@ -1,6 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> General API