From: Pierre-Luc Beaudoin Date: Tue, 16 Sep 2008 11:52:59 +0000 (-0400) Subject: Initial creation X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f25a5ac32f1f854db8a269a19ceec61678a037c;p=libchamplain Initial creation --- 9f25a5ac32f1f854db8a269a19ceec61678a037c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ac5ec5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,32 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +champlain-1.0.pc +champlain.pc +.deps +.libs +*.o +*.lo +*.la +champlain/champlain-marshal.c +champlain/champlain-marshal.h +champlain/launcher +config.guess +config.h +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +stamp-h1 +tidy/stamp-tidy-enum-types.h +tidy/stamp-tidy-marshal.h +tidy/tidy-enum-types.c +tidy/tidy-enum-types.h +tidy/tidy-marshal.c +tidy/tidy-marshal.h diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..623b625 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..23e5f25 --- /dev/null +++ b/INSTALL @@ -0,0 +1,236 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..c6fdc5b --- /dev/null +++ b/Makefile.am @@ -0,0 +1,12 @@ +SUBDIRS = champlain-gtk docs/reference + +pcfiles = champlain-gtk-1.0.pc + +champlain-gtk-1.0.pc: champlain-gtk.pc + @cp -f $< $@ + +pkgconfig_DATA = $(pcfiles) +pkgconfigdir = $(libdir)/pkgconfig + +DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc + diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/champlain-gtk.pc.in b/champlain-gtk.pc.in new file mode 100644 index 0000000..d9d100f --- /dev/null +++ b/champlain-gtk.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libchamplain-gtk +Description: Gtk+ Widget wrapper for libchamplain +Version: @VERSION@ +Libs: -L${libdir} -lchamplain-gtk-1.0 +Cflags: -I${includedir}/libchamplain-1.0 +Requires: gobject-2.0 clutter-0.8 clutter-gtk-0.8 gtk+-2.0 diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am new file mode 100644 index 0000000..989c36a --- /dev/null +++ b/champlain-gtk/Makefile.am @@ -0,0 +1,39 @@ + +BUILT_SOURCES = \ + champlain-gtk-marshal.h \ + champlain-gtk-marshal.c + +CLEANFILES = $(BUILT_SOURCES) + +CHAMPLAIN_GTK_MARSHAL = champlain-gtk-marshal +CHAMPLAIN_GTK_MARSHAL_LIST = champlain-gtk-marshal.list + +lib_LTLIBRARIES = libchamplain-gtk-1.0.la + +libchamplain_gtk_1_0_la_SOURCES = $(CHAMPLAIN_GTK_MARSHAL_LIST) \ + $(BUILT_SOURCES) \ + champlainviewembed.c + +noinst_HEADERS = champlainviewembed.h + +libchamplain_gtk_1_0_la_LIBADD = $(DEPS_LIBS) + +champlain-gtk-marshal.h: $(CHAMPLAIN_GTK_MARSHAL_LIST) + @GLIB_GENMARSHAL@ --header --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).h + +champlain-gtk-marshal.c: $(CHAMPLAIN_GTK_MARSHAL_LIST) + @GLIB_GENMARSHAL@ --body --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).c + +libchamplain_includedir=$(includedir)/libchamplain-gtk-1.0/champlain-gtk +libchamplain_include_HEADERS = champlainviewembed.h + +libchamplain_gtk_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION) + +noinst_PROGRAMS = launcher + +AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir) +AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.* +launcher_SOURCES = launcher.c +launcher_LDADD = $(DEPS_LIBS) libchamplain-gtk-1.0.la + +EXTRA_DIST = $(CHAMPLAIN_GTK_MARSHAL_LIST) diff --git a/champlain-gtk/champlain-gtk-marshal.list b/champlain-gtk/champlain-gtk-marshal.list new file mode 100644 index 0000000..e69de29 diff --git a/champlain-gtk/champlainviewembed.c b/champlain-gtk/champlainviewembed.c new file mode 100644 index 0000000..5381ee3 --- /dev/null +++ b/champlain-gtk/champlainviewembed.c @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2008 Pierre-Luc Beaudoin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "config.h" + +#include +#include + +#include +#include +#include + +enum +{ + /* normal signals */ + SIGNAL_TBD, + LAST_SIGNAL +}; + + +static guint champlain_view_embed_embed_signals[LAST_SIGNAL] = { 0, }; + +#define CHAMPLAIN_VIEW_EMBED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_VIEW_EMBED, ChamplainViewEmbedPrivate)) + +struct _ChamplainViewEmbedPrivate +{ + GtkWidget *clutter_embed; + ChamplainView *view; + + GdkCursor *cursor_hand_open; + GdkCursor *cursor_hand_closed; +}; + + +static void champlain_view_embed_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); +static void champlain_view_embed_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void champlain_view_embed_finalize (GObject *object); +static void champlain_view_embed_class_init (ChamplainViewEmbedClass *champlainViewEmbedClass); +static void champlain_view_embed_init (ChamplainViewEmbed *view); +static void view_size_allocated_cb (GtkWidget *widget, GtkAllocation *allocation, ChamplainViewEmbed *view); + +G_DEFINE_TYPE (ChamplainViewEmbed, champlain_view_embed, GTK_TYPE_ALIGNMENT); + +static void +champlain_view_embed_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + ChamplainViewEmbed *view = CHAMPLAIN_VIEW_EMBED(object); + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (view); + + switch(prop_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void +champlain_view_embed_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + ChamplainViewEmbed *view = CHAMPLAIN_VIEW_EMBED(object); + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (view); + + switch(prop_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void +champlain_view_embed_finalize (GObject *object) +{ + ChamplainViewEmbed *view = CHAMPLAIN_VIEW_EMBED (object); + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (view); + + G_OBJECT_CLASS (champlain_view_embed_parent_class)->finalize (object); +} + +static void +champlain_view_embed_class_init (ChamplainViewEmbedClass *champlainViewEmbedClass) +{ + g_type_class_add_private (champlainViewEmbedClass, sizeof (ChamplainViewEmbedPrivate)); + + GObjectClass *object_class = G_OBJECT_CLASS (champlainViewEmbedClass); + object_class->finalize = champlain_view_embed_finalize; + object_class->get_property = champlain_view_embed_get_property; + object_class->set_property = champlain_view_embed_set_property; + +} + +static void +champlain_view_embed_init (ChamplainViewEmbed *view) +{ + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (view); + + priv->view = NULL; +} + +static void +view_size_allocated_cb (GtkWidget *widget, GtkAllocation *allocation, ChamplainViewEmbed *view) +{ + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (view); + + champlain_view_set_size(priv->view, allocation->width, allocation->height); + + // Setup mouse cursor to a hand + gdk_window_set_cursor( priv->clutter_embed->window, priv->cursor_hand_open); +} + +static gboolean +mouse_button_cb (GtkWidget *widget, GdkEventButton *event, ChamplainViewEmbed *view) +{ + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (view); + + if (event->type == GDK_BUTTON_PRESS) + gdk_window_set_cursor( priv->clutter_embed->window, priv->cursor_hand_closed); + else + gdk_window_set_cursor( priv->clutter_embed->window, priv->cursor_hand_open); + + return FALSE; +} + +/** + * champlain_view_embed_new: + * @mode: a #ChamplainView, the map view to embed + * Returns a new #ChamplainViewEmbed ready to be used as a #GtkWidget. + * + * Since: 0.2.1 + */ +GtkWidget * +champlain_view_embed_new (ChamplainView *view) +{ + ClutterColor stage_color = { 0x34, 0x39, 0x39, 0xff }; + ChamplainViewEmbed *embed; + ClutterActor *stage; + + embed = CHAMPLAIN_VIEW_EMBED (g_object_new (CHAMPLAIN_TYPE_VIEW_EMBED, NULL)); + ChamplainViewEmbedPrivate *priv = CHAMPLAIN_VIEW_EMBED_GET_PRIVATE (embed); + + priv->view = view; + priv->clutter_embed = gtk_clutter_embed_new (); + g_signal_connect (priv->clutter_embed, + "size-allocate", + G_CALLBACK (view_size_allocated_cb), + embed); + g_signal_connect (priv->clutter_embed, + "button-press-event", + G_CALLBACK (mouse_button_cb), + embed); + g_signal_connect (priv->clutter_embed, + "button-release-event", + G_CALLBACK (mouse_button_cb), + embed); + // Setup cursors + priv->cursor_hand_open = gdk_cursor_new(GDK_HAND1); + priv->cursor_hand_closed = gdk_cursor_new(GDK_FLEUR); + + // Setup stage + stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->clutter_embed)); + clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_container_add_actor (CLUTTER_CONTAINER (stage), view); + + gtk_container_add (GTK_CONTAINER (embed), priv->clutter_embed); + + return GTK_WIDGET (embed); +} + +ChamplainView * +champlain_view_embed_get_view (ChamplainViewEmbed* embed) +{ + return priv->view; +} diff --git a/champlain-gtk/champlainviewembed.h b/champlain-gtk/champlainviewembed.h new file mode 100644 index 0000000..a237520 --- /dev/null +++ b/champlain-gtk/champlainviewembed.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2008 Pierre-Luc Beaudoin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef CHAMPLAIN_VIEW_H +#define CHAMPLAIN_VIEW_H + +#include +#include + +#define CHAMPLAIN_TYPE_VIEW_EMBED (champlain_view_embed_get_type()) +#define CHAMPLAIN_VIEW_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_VIEW_EMBED, ChamplainViewEmbed)) +#define CHAMPLAIN_VIEW_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CHAMPLAIN_TYPE_VIEW_EMBED, ChamplainViewEmbedClass)) +#define CHAMPLAIN_IS_VIEW_EMBED(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_VIEW_EMBED)) +#define CHAMPLAIN_IS_VIEW_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), CHAMPLAIN_TYPE_VIEW_EMBED)) +#define CHAMPLAIN_VIEW_EMBED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), CHAMPLAIN_TYPE_VIEW_EMBED, ChamplainViewEmbedClass)) + +typedef struct _ChamplainViewEmbedPrivate ChamplainViewEmbedPrivate; + + +struct _ChamplainViewEmbed +{ + GtkAlignment bin; + + ChamplainViewEmbedPrivate *priv; +}; + +struct _ChamplainViewEmbedClass +{ + GtkBinClass parent_class; + +}; + +typedef struct _ChamplainViewEmbed ChamplainViewEmbed; + +typedef struct _ChamplainViewEmbedClass ChamplainViewEmbedClass; + +GType champlain_view_embed_get_type (void); + +GtkWidget *champlain_view_embed_new (ChamplainView* view); + +ChamplainView *champlain_view_embed_get_view (ChamplainViewEmbed* embed); + +#endif diff --git a/champlain-gtk/launcher.c b/champlain-gtk/launcher.c new file mode 100644 index 0000000..212b52a --- /dev/null +++ b/champlain-gtk/launcher.c @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2008 Pierre-Luc Beaudoin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include + +#include + +#include + +#define OSM_MAP "Open Street Map" +#define OAM_MAP "Open Arial Map" +#define MFF_MAP "Maps for free - Relief" + +/* + * Terminate the main loop. + */ +static void +on_destroy (GtkWidget *widget, gpointer data) +{ + gtk_main_quit (); +} + +static ClutterActor* +create_marker_layer () +{ + ClutterActor *layer, *marker; + + layer = clutter_group_new(); + + ClutterColor orange = { 0xf3, 0x94, 0x07, 0xbb }; + ClutterColor white = { 0xff, 0xff, 0xff, 0xff }; + marker = champlain_marker_new_with_label("Montréal", "Airmole 14", NULL, NULL); + champlain_marker_set_position(CHAMPLAIN_MARKER(marker), -73.563788, 45.528178); + clutter_container_add(CLUTTER_CONTAINER(layer), marker, NULL); + + marker = champlain_marker_new_with_label("New York", "Sans 25", &white, NULL); + champlain_marker_set_position(CHAMPLAIN_MARKER(marker), -73.98, 40.77); + clutter_container_add(CLUTTER_CONTAINER(layer), marker, NULL); + + marker = champlain_marker_new_with_label("Saint-Tite-des-Caps", "Serif 12", NULL, &orange); + champlain_marker_set_position(CHAMPLAIN_MARKER(marker), -70.764141, 47.130885); + clutter_container_add(CLUTTER_CONTAINER(layer), marker, NULL); + + clutter_actor_hide(layer); + return layer; +} + +static void +toggle_layer (GtkToggleButton *widget, ClutterActor *layer) +{ + if(gtk_toggle_button_get_active(widget)) + clutter_actor_show_all(layer); + else + clutter_actor_hide(layer); +} + +static void +map_source_changed (GtkWidget *widget, ChamplainView *view) +{ + gchar* selection = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)); + if (g_strcmp0(selection, OSM_MAP) == 0) + { + g_object_set(G_OBJECT(view), "map-source", CHAMPLAIN_MAP_SOURCE_OPENSTREETMAP, NULL); + } + else if (g_strcmp0(selection, OAM_MAP) == 0) + { + g_object_set(G_OBJECT(view), "map-source", CHAMPLAIN_MAP_SOURCE_OPENARIALMAP, NULL); + } + else if (g_strcmp0(selection, MFF_MAP) == 0) + { + g_object_set(G_OBJECT(view), "map-source", CHAMPLAIN_MAP_SOURCE_MAPSFORFREE_RELIEF, NULL); + } +} + +static void +zoom_changed (GtkSpinButton *spinbutton, ChamplainView *view) +{ + gint zoom = gtk_spin_button_get_value_as_int(spinbutton); + g_object_set(G_OBJECT(view), "zoom-level", zoom, NULL); +} + +static void +map_zoom_changed (ChamplainView *view, GParamSpec *gobject, GtkSpinButton *spinbutton) +{ + gint zoom; + g_object_get(G_OBJECT(view), "zoom-level", &zoom, NULL); + gtk_spin_button_set_value(spinbutton, zoom); +} + +static void +zoom_in (GtkWidget *widget, ChamplainView *view) +{ + champlain_view_zoom_in(view); +} + +static void +zoom_out (GtkWidget *widget, ChamplainView *view) +{ + champlain_view_zoom_out(view); +} + +int +main (int argc, char *argv[]) +{ + GtkWidget *window; + GtkWidget *widget, *vbox, *bbox, *button, *viewport; + GtkWidget *scrolled; + ClutterActor *layer, *view; + + g_thread_init (NULL); + gtk_clutter_init (&argc, &argv); + + /* create the main, top level, window */ + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + + /* give the window a 10px wide border */ + gtk_container_set_border_width (GTK_CONTAINER (window), 10); + + /* give it the title */ + gtk_window_set_title (GTK_WINDOW (window), PACKAGE " " VERSION); + + /* Connect the destroy event of the window with our on_destroy function + * When the window is about to be destroyed we get a notificaiton and + * stop the main GTK loop + */ + g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (on_destroy), NULL); + + vbox = gtk_vbox_new(FALSE, 10); + + view = champlain_view_new (CHAMPLAIN_VIEW_MODE_KINETIC); + widget = champlain_view_embed_new(view); + g_object_set(G_OBJECT(view), "zoom-level", 5, NULL); + layer = create_marker_layer(); + champlain_view_add_layer(view, layer); + + gtk_widget_set_size_request(widget, 640, 480); + + bbox = gtk_hbox_new (FALSE, 10); + button = gtk_button_new_from_stock (GTK_STOCK_ZOOM_IN); + g_signal_connect (button, + "clicked", + G_CALLBACK (zoom_in), + view); + gtk_container_add (GTK_CONTAINER (bbox), button); + button = gtk_button_new_from_stock (GTK_STOCK_ZOOM_OUT); + g_signal_connect (button, + "clicked", + G_CALLBACK (zoom_out), + view); + gtk_container_add (GTK_CONTAINER (bbox), button); + button = gtk_toggle_button_new_with_label ("Markers"); + g_signal_connect (button, + "toggled", + G_CALLBACK (toggle_layer), + layer); + gtk_container_add (GTK_CONTAINER (bbox), button); + + button = gtk_combo_box_new_text(); + gtk_combo_box_append_text(GTK_COMBO_BOX(button), OSM_MAP); + gtk_combo_box_append_text(GTK_COMBO_BOX(button), OAM_MAP); + gtk_combo_box_append_text(GTK_COMBO_BOX(button), MFF_MAP); + gtk_combo_box_set_active(GTK_COMBO_BOX(button), 0); + g_signal_connect (button, + "changed", + G_CALLBACK (map_source_changed), + view); + gtk_container_add (GTK_CONTAINER (bbox), button); + + button = gtk_spin_button_new_with_range(0, 20, 1); + g_signal_connect (button, + "changed", + G_CALLBACK (zoom_changed), + view); + g_signal_connect (view, + "notify::zoom-level", + G_CALLBACK (map_zoom_changed), + button); + gtk_container_add (GTK_CONTAINER (bbox), button); + + viewport = gtk_viewport_new (NULL, NULL); + gtk_viewport_set_shadow_type (GTK_VIEWPORT(viewport), GTK_SHADOW_ETCHED_IN); + gtk_container_add (GTK_CONTAINER (viewport), widget); + + gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (vbox), viewport); + + /* and insert it into the main window */ + gtk_container_add (GTK_CONTAINER (window), vbox); + + /* make sure that everything, window and label, are visible */ + gtk_widget_show_all (window); + champlain_view_center_on(CHAMPLAIN_VIEW(view), -73.75, 45.466); + /* start the main loop */ + gtk_main (); + + return 0; +} + diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..09ee04c --- /dev/null +++ b/config.h.in @@ -0,0 +1,55 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..4cabb4e --- /dev/null +++ b/configure.ac @@ -0,0 +1,48 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.61) +AC_INIT(libchamplain-gtk, 0.2, pierre-luc@squidy.info) +AC_CONFIG_SRCDIR([champlain-gtk/champlainviewembed.h]) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR(m4) + + +AM_INIT_AUTOMAKE +AC_LIBTOOL_DLOPEN +AC_LIBLTDL_CONVENIENCE +AM_PROG_LIBTOOL + +# Checks for programs. +AC_PROG_CC +AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) + +# Checks for libraries. +LIBRARY_VERSION=0:1:0 + +AC_SUBST(LIBRARY_VERSION) +AC_SUBST(DEPS_CFLAGS) +AC_SUBST(DEPS_LIBS) + +PKG_CHECK_MODULES(DEPS, + [ gtk+-2.0 >= 2.2, + clutter-0.8 >= 0.8, + clutter-gtk-0.8 >= 0.8, + champlain-1.0 >= 0.2 + ] +) +# check for gtk-doc +GTK_DOC_CHECK(1.9) + +AC_CONFIG_FILES([Makefile + champlain-gtk/Makefile + docs/reference/Makefile + champlain-gtk.pc]) +AC_OUTPUT + +echo "" +echo " libchamplain-gtk $VERSION" +echo "" +echo " Prefix: ${prefix}" +echo " Compiler flags: ${CPPFLAGS}" +echo "" diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am new file mode 100644 index 0000000..1d16a93 --- /dev/null +++ b/docs/reference/Makefile.am @@ -0,0 +1,81 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = 1.6 + +# The name of the module, e.g. 'glib'. +DOC_MODULE=libchamplain-gtk + +# The top-level SGML file. You can change this if you want to. +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml + +# The directory containing the source code. Relative to $(srcdir). +# gtk-doc will search all .c & .h files beneath here for inline comments +# documenting the functions and macros. +# e.g. DOC_SOURCE_DIR=../../../gtk +DOC_SOURCE_DIR=../../champlain-gtk + +# Extra options to pass to gtkdoc-scangobj. Not normally needed. +SCANGOBJ_OPTIONS= + +# Extra options to supply to gtkdoc-scan. +# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" +SCAN_OPTIONS=--deprecated-guards="CHAMPLAIN_OBSOLETE_API" + +# Extra options to supply to gtkdoc-mkdb. +# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml +MKDB_OPTIONS=--sgml-mode --output-format=xml + +# Extra options to supply to gtkdoc-mktmpl +# e.g. MKTMPL_OPTIONS=--only-section-tmpl +MKTMPL_OPTIONS= + +# Extra options to supply to gtkdoc-fixref. Not normally needed. +# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html +FIXXREF_OPTIONS= + +# Used for dependencies. The docs will be rebuilt if any of these change. +# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h +# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c +HFILE_GLOB=$(top_srcdir)/champlain-gtk/*.h +CFILE_GLOB=$(top_srcdir)/champlain-gtk/*.c + +# Header files to ignore when scanning. +# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h +IGNORE_HFILES= + +# Images to copy into HTML directory. +# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png +HTML_IMAGES= + +# 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= + +# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# These files must be listed here *and* in content_files +# e.g. expand_content_files=running.sgml +expand_content_files= + +# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. +# Only needed if you are using gtkdoc-scangobj to dynamically query widget +# signals and properties. +# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) +# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +INCLUDES=-I$(top_builddir)/champlain -I$(top_builddir) $(DEPS_CFLAGS) +GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain-gtk/libchamplain-gtk-1.0.la + +# This includes the standard gtk-doc make rules, copied by gtkdocize. +include $(top_srcdir)/gtk-doc.make + +# Other files to distribute +# e.g. EXTRA_DIST += version.xml.in +EXTRA_DIST += + +# Files not to distribute +# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types +# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt +#DISTCLEANFILES += + +# Comment this out if you want your docs-status tested during 'make check' +#TESTS = $(GTKDOC_CHECK) + diff --git a/docs/reference/libchamplain-gtk-sections.txt b/docs/reference/libchamplain-gtk-sections.txt new file mode 100644 index 0000000..e74925f --- /dev/null +++ b/docs/reference/libchamplain-gtk-sections.txt @@ -0,0 +1,21 @@ +
+champlainviewembed +ChamplainViewEmbedPrivate +ChamplainViewEmbed +ChamplainViewEmbed +champlain_view_embed_new +champlain_view_embed_get_view + +CHAMPLAIN_VIEW_EMBED +CHAMPLAIN_IS_VIEW_EMBED +CHAMPLAIN_TYPE_VIEW_EMBED +champlain_view_embed_get_type +CHAMPLAIN_VIEW_EMBED_CLASS +CHAMPLAIN_IS_VIEW_EMBED_CLASS +CHAMPLAIN_VIEW_EMBED_GET_CLASS +
+ +
+champlain-gtk-marshal +
+ diff --git a/docs/reference/tmpl/champlainview.sgml b/docs/reference/tmpl/champlainview.sgml new file mode 100644 index 0000000..fa75da2 --- /dev/null +++ b/docs/reference/tmpl/champlainview.sgml @@ -0,0 +1,131 @@ + +ChamplainView + + +A widget to display maps + + + +The #ChamplainView widget is a Clutter based widget to display maps. It supports two modes of scrolling: + + Push: the normal behavior where the maps doesn't move after the user stopped scrolling; + Kinetic: the iPhone-like behavior where the maps decelerate after the user stopped scrolling. + + + +You can use the same #ChamplainView to display many types of maps. In Champlain they are called map sources. You can change the #map-source property at anytime to replace the current displayed map. + + +The maps are downloaded from Internet from open maps sources (like OpenStreetMap). Maps are divided in tiles for each zoom level. When a tile is requested, #ChamplainView will first check if it is in cache (in +the user's cache dir under champlain). If an error occurs during download, an error tile will be displayed (if not in offline mode). + + + + + + + + + + + + + + + + + + +@CHAMPLAIN_MAP_SOURCE_DEBUG: +@CHAMPLAIN_MAP_SOURCE_OPENSTREETMAP: +@CHAMPLAIN_MAP_SOURCE_OPENARIALMAP: +@CHAMPLAIN_MAP_SOURCE_MAPSFORFREE_RELIEF: +@CHAMPLAIN_MAP_SOURCE_COUNT: + + + + + + +@CHAMPLAIN_VIEW_MODE_PUSH: +@CHAMPLAIN_VIEW_MODE_KINETIC: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@mode: +@Returns: + + + + + + + +@view: +@longitude: +@latitude: + + + + + + + +@champlainView: + + + + + + + +@champlainView: + + diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 new file mode 100644 index 0000000..bfdfa1d --- /dev/null +++ b/m4/gtk-doc.m4 @@ -0,0 +1,39 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) +])