openvrml-commit — Changes to OpenVRML's source revision repository

[openvrml-commit] openvrml/lib/gtkglext .cvsignore, NONE, 1.2.2.1 AUTHORS, NONE, 1.1.1.1.4.1 COPYING, NONE, 1.1.1.1.4.1 COPYING.LIB, NONE, 1.1.1.1.4.1 ChangeLog, NONE, 1.1.1.1.4.1 ChangeLog.pre-1-0, NONE, 1.1.1.1.4.1 INSTALL, NONE, 1.1.1.1.4.1 Makefile.am, NONE, 1.2.2.1 NEWS, NONE, 1.1.1.1.4.1 README, NONE, 1.1.1.1.4.1 README.win32, NONE, 1.1.1.1.4.1 TODO, NONE, 1.1.1.1.4.1 configure.in, NONE, 1.2.2.1 gdkglext-uninstalled.pc.in, NONE, 1.1.1.1.4.1 gdkglext.pc.in, NONE, 1.1.1.1.4.1 gtkglext-uninstalled.pc.in, NONE, 1.1.1.1.4.1 gtkglext.nsi.in, NONE, 1.1.1.1.4.1 gtkglext.pc.in, NONE, 1.1.1.1.4.1 gtkglext.spec.in, NONE, 1.1.1.1.4.1 setup-gtkglext.sh, NONE, 1.1.1.1.4.1

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7146/lib/gtkglext

Added Files:
      Tag: OpenVRML-0_16-BRANCH
	.cvsignore AUTHORS COPYING COPYING.LIB ChangeLog 
	ChangeLog.pre-1-0 INSTALL Makefile.am NEWS README README.win32 
	TODO configure.in gdkglext-uninstalled.pc.in gdkglext.pc.in 
	gtkglext-uninstalled.pc.in gtkglext.nsi.in gtkglext.pc.in 
	gtkglext.spec.in setup-gtkglext.sh 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: setup-gtkglext.sh ---
#!/bin/sh
#
# Setup GtkGLExt win32 binary package.
#

PKGCONFIG_FILES="lib/pkgconfig/gdkglext-1.0.pc lib/pkgconfig/gdkglext-win32-1.0.pc lib/pkgconfig/gtkglext-1.0.pc lib/pkgconfig/gtkglext-win32-1.0.pc"

PREFIX=""

case $# in
1)
    PREFIX="$1"
    ;;
*)
    echo ""
    echo "Usage: ${0#*/} <unpacked prefix dir>"
    echo ""
    echo "Example: ./${0#*/} c:/gtkglext"
    echo ""
    exit
    ;;
esac

#
# Update .pc files
#
for file in ${PKGCONFIG_FILES}; do

    src="${PREFIX}/${file}.orig-$$"
    dst="${PREFIX}/${file}"

    echo -n "${dst}: "

    if test ! -f ${dst}; then
        echo "no such file"
        exit
    fi

    cp ${dst} ${src}
    cat ${src} | sed -e "s|^prefix=.*|prefix=${PREFIX}|" > ${dst}

    echo "updated"

done

echo "done."

echo ""
echo "PATH:            ${PREFIX}/bin"
echo "PKG_CONFIG_PATH: ${PREFIX}/lib/pkgconfig"
echo ""

--- NEW FILE: COPYING.LIB ---

                  GNU LESSER GENERAL PUBLIC LICENSE
                       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

                            Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations
below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
^L
  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes a de-facto standard.  To achieve this, non-free programs must
be allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
^L
                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control
compilation and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.

  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.
^L
  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
^L
  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at least
    three years, to give the same user the materials specified in
    Subsection 6a, above, for a charge no more than the cost of
    performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
^L
  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
^L
  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply, and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License
may add an explicit geographical distribution limitation excluding those
countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
^L
  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

                            NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

                     END OF TERMS AND CONDITIONS
^L
           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms
of the ordinary General Public License).

  To apply these terms, attach the following notices to the library.
It is safest to attach them to the start of each source file to most
effectively convey the exclusion of warranty; and each file should
have at least the "copyright" line and a pointer to where the full
notice is found.


    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or
your school, if any, to sign a "copyright disclaimer" for the library,
if necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James
  Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!



--- NEW FILE: ChangeLog.pre-1-0 ---
2003-05-14  Naofumi Yasufuku  <na...@us...>

	* ==== Released 1.0.0 ====

	* configure.in: Version 1.0.0, Binary age 0, interface age 0.

	* Makefile.am (EXTRA_DIST): 
	* ChangeLog.pre-1-0: pre-1.0 ChangeLog is renamed.

2003-05-13  Naofumi Yasufuku  <na...@us...>

	* gdk/x11/gdkglconfig-x11.c (gdk_gl_config_new_common): 
	* gdk/x11/gdkglquery-x11.c (_gdk_x11_gl_print_glx_info): 
	* gdk/x11/gdkglprivate-x11.h: Clean up debug routines.

2003-05-14  Alif Wahid  <aw...@us...>

	* examples/viewlw.c: added a "key_press_event" handler for
	allowing the user to zoom in/out using the +/- keys. Also now
[...1687 lines suppressed...]

	* Alpha release. Version 0.1.0.

2002-06-02  Naofumi Yasufuku  <na...@us...>

	* Win32 target works!

	* gdk/gdkglconfig.h: 
	* gdk/x11/gdkglconfig-x11.c (gdk_gl_config_new): 
	* gdk/win32/gdkglconfig-win32.c (gdk_gl_config_new): It's
	interface is changed for Win32. Win32 ChoosePixelFormat ()
	requires target window's HDC, and now gdk_gl_config_new () needs
	taking a realized GdkWindow instance.

2002-05-27  Naofumi Yasufuku  <na...@us...>

	* First pre-alpha release.

	* X11 target is implemented and tested on Linux and IRIX.


--- NEW FILE: gtkglext.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

target=@gdktarget@
api_version=@GTKGLEXT_API_VERSION@

multihead=@GDKGLEXT_MULTIHEAD_SUPPORT@

Name: GtkGLExt
Description: OpenGL Extension to GTK+ (${target} target)
Version: @VERSION@
Requires: gdkglext-${target}-${api_version} @GTKGLEXT_PACKAGES@
Libs: -L${libdir} -lgtkglext-${target}-${api_version} @GTKGLEXT_EXTRA_LIBS@
Cflags: -I${includedir}/gtkglext-${api_version} @GTKGLEXT_EXTRA_CFLAGS@

--- NEW FILE: COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    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.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


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.

  <signature of Ty Coon>, 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.

--- NEW FILE: configure.in ---
# required autoconf version
AC_PREREQ([2.54])

#
# Making releases:
#   gtkglext_micro_version += 1;
#   gtkglext_interface_age += 1;
#   gtkglext_binary_age += 1;
# if any functions have been added, set gtkglext_interface_age to 0.
# if backwards compatibility has been broken,
# set gtkglext_binary_age and gtkglext_interface_age to 0.
#
m4_define([gtkglext_major_version], [1])
m4_define([gtkglext_minor_version], [2])
m4_define([gtkglext_micro_version], [0])
m4_define([gtkglext_interface_age], [0])
m4_define([gtkglext_binary_age],    [0])
m4_define([gtkglext_version],
          [gtkglext_major_version.gtkglext_minor_version.gtkglext_micro_version])

# This is the X.Y used in -lgtkglext-FOO-X.Y
m4_define([gtkglext_api_major_version], [1])
m4_define([gtkglext_api_minor_version], [0])
m4_define([gtkglext_api_version],
          [gtkglext_api_major_version.gtkglext_api_minor_version])

# libtool version related macros
m4_define([gtkglext_lt_release],
          [gtkglext_major_version.gtkglext_minor_version])
m4_define([gtkglext_lt_current],
          [m4_eval(gtkglext_micro_version - gtkglext_interface_age)])
m4_define([gtkglext_lt_revision],
          [gtkglext_interface_age])
m4_define([gtkglext_lt_age],
          [m4_eval(gtkglext_binary_age - gtkglext_interface_age)])
m4_define([gtkglext_lt_current_minus_age],
          [m4_eval(gtkglext_lt_current - gtkglext_lt_age)])

# if the minor version number is odd, then we want debugging.  Otherwise
# we only want minimal debugging support.
m4_define([gtkglext_debug_default],
          [m4_if(m4_eval(gtkglext_minor_version % 2), [1], [yes], [minimum])])dnl

# Versions of dependencies

# Glib
m4_define([glib_pkg], [glib-2.0])
m4_define([glib_required_version], [2.0.0])

# GObject
m4_define([gobject_pkg], [gobject-2.0])
m4_define([gobject_required_version], [2.0.0])

# GModule
m4_define([gmodule_pkg], [gmodule-2.0])
m4_define([gmodule_required_version], [2.0.0])

# Pango
m4_define([pango_pkg], [pango])
m4_define([pango_required_version], [1.0.0])

# Pangox
m4_define([pangox_pkg], [pangox])
m4_define([pangox_required_version], [1.0.0])

# PangoFT2
m4_define([pangoft2_pkg], [pangoft2])
m4_define([pangoft2_required_version], [1.0.0])

# GDK
m4_define([gdk_pkg], [gdk-2.0])
m4_define([gdk_required_version], [2.0.0])

# GTK+
m4_define([gtk_pkg], [gtk+-2.0])
m4_define([gtk_required_version], [2.0.0])


# Process this file with autoconf to produce a configure script.
AC_INIT([gtkglext], [gtkglext_version],
        [gtk...@gn...])

AC_CONFIG_SRCDIR([gdk/gdkgl.h])

# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}

# Initialize automake stuff
AM_INIT_AUTOMAKE([1.7 no-define dist-bzip2 dist-zip])

# Specify a configuration file
AM_CONFIG_HEADER([config.h])

AC_CANONICAL_HOST

# GtkGLExt version
GTKGLEXT_MAJOR_VERSION=gtkglext_major_version
GTKGLEXT_MINOR_VERSION=gtkglext_minor_version
GTKGLEXT_MICRO_VERSION=gtkglext_micro_version
GTKGLEXT_INTERFACE_AGE=gtkglext_interface_age
GTKGLEXT_BINARY_AGE=gtkglext_binary_age
GTKGLEXT_VERSION=gtkglext_version
# This is the X.Y used in -lgtkglext-FOO-X.Y
GTKGLEXT_API_MAJOR_VERSION=gtkglext_api_major_version
GTKGLEXT_API_MINOR_VERSION=gtkglext_api_minor_version
GTKGLEXT_API_VERSION=gtkglext_api_version
API_MJ=$GTKGLEXT_API_MAJOR_VERSION
API_MI=$GTKGLEXT_API_MINOR_VERSION
AC_SUBST([GTKGLEXT_MAJOR_VERSION])
AC_SUBST([GTKGLEXT_MINOR_VERSION])
AC_SUBST([GTKGLEXT_MICRO_VERSION])
AC_SUBST([GTKGLEXT_INTERFACE_AGE])
AC_SUBST([GTKGLEXT_BINARY_AGE])
AC_SUBST([GTKGLEXT_VERSION])
AC_SUBST([GTKGLEXT_API_MAJOR_VERSION])
AC_SUBST([GTKGLEXT_API_MINOR_VERSION])
AC_SUBST([GTKGLEXT_API_VERSION])
AC_SUBST([API_MJ])
AC_SUBST([API_MI])

# libtool versioning
LT_RELEASE=gtkglext_lt_release
LT_CURRENT=gtkglext_lt_current
LT_REVISION=gtkglext_lt_revision
LT_AGE=gtkglext_lt_age
LT_CURRENT_MINUS_AGE=gtkglext_lt_current_minus_age
AC_SUBST([LT_RELEASE])
AC_SUBST([LT_CURRENT])
AC_SUBST([LT_REVISION])
AC_SUBST([LT_AGE])
AC_SUBST([LT_CURRENT_MINUS_AGE])

dnl Initialize libtool
AC_PROG_CC
AC_PROG_CPP
AC_ISC_POSIX
#AM_DISABLE_STATIC
AM_DISABLE_SHARED
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL

platform_win32=no
AC_MSG_CHECKING([for some Win32 platform])
case "$host_os" in
  *mingw*|*cygwin*)
    platform_win32=yes
    ;;
  *)
    ;;
esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL([PLATFORM_WIN32], [test "x$platform_win32" = "xyes"])

os_win32=no
MATH_LIB=-lm
AC_MSG_CHECKING([for native Win32])
case "$host_os" in
  *mingw*)
    os_win32=yes
    MATH_LIB=
    ;;
  *)
    ;;
esac
AC_MSG_RESULT([$os_win32])
AM_CONDITIONAL([OS_WIN32], [test "x$os_win32" = "xyes"])
AC_SUBST([MATH_LIB])

if test "x$os_win32" = "xyes"; then
  AC_CHECK_PROG([ms_librarian], [lib.exe], [yes], [no])
fi
AM_CONDITIONAL([MS_LIB_AVAILABLE], [test "x$ms_librarian" = "xyes"])

if test "x$platform_win32" = "xyes"; then
  gdktarget=win32
else
  gdktarget=x11
fi

AC_ARG_WITH([gdktarget],
            [AC_HELP_STRING([--with-gdktarget=@<:@x11/win32@:>@],
                            [select GDK target])],
            [gdktarget=$with_gdktarget])

AC_SUBST([gdktarget])
case $gdktarget in
  x11|win32) ;;
  *) AC_MSG_ERROR([Invalid target for GDK: use x11 or win32.]);;
esac

gdkglext_targetlib=libgdkglext-$gdktarget-$GTKGLEXT_API_VERSION.la
gtkglext_targetlib=libgtkglext-$gdktarget-$GTKGLEXT_API_VERSION.la

AC_SUBST([gdkglext_targetlib])
AC_SUBST([gtkglext_targetlib])


# Build time sanity check...
AM_SANITY_CHECK

# Checks for programs.
AM_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
AC_PROG_AWK

# Debug option
AC_ARG_ENABLE([debug],
              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
                             [turn on debugging @<:@default=gtkglext_debug_default@:>@]), ,
              [enable_debug=gtkglext_debug_default])

# Strict ansi
AC_ARG_ENABLE([ansi],
              [AC_HELP_STRING([--enable-ansi],
                              [turn on strict ansi [default=no]])], ,
	      [enable_ansi=no])

changequote(,)dnl
if test "x$GCC" = "xyes"; then
  case " $CFLAGS " in
  *[\ \	]-Wall[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wall" ;;
  esac

  if test "x$enable_ansi" = "xyes"; then
    case " $CFLAGS " in
    *[\ \	]-ansi[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -ansi" ;;
    esac

    case " $CFLAGS " in
    *[\ \	]-pedantic[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -pedantic" ;;
    esac
  fi
fi

if test "x$enable_debug" = "xyes"; then
  if test x$cflags_set != xset ; then
      case " $CFLAGS " in
      *[[\ \	]]-g[[\ \	]]*) ;;
      *) CFLAGS="$CFLAGS -g" ;;
      esac
  fi
  GTKGLEXT_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
else
  if test "x$enable_debug" = "xno"; then
    GTKGLEXT_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
  else
    GTKGLEXT_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
  fi
fi
changequote([,])dnl

AC_SUBST([GTKGLEXT_DEBUG_FLAGS])

# Platform-specific compiler options
case "$host_os" in
  irix5* | irix6*)
    # Suppress linker warnings
    if test "x$with_gnu_ld" = "xno"; then
      LDFLAGS="$LDFLAGS -Wl,-woff,84 -Wl,-woff,127"
    fi
    ;;
  *)
    ;;
esac

# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc.
# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
# gcc2 uses "-fnative-struct".
if test "x$os_win32" = "xyes"; then
  if test "x$GCC" = "xyes"; then
    msnative_struct=''
    AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
    if test -z "$ac_cv_prog_CC"; then
      our_gcc="$CC"
    else
      our_gcc="$ac_cv_prog_CC"
    fi
    case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
      2.)
	if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
	  msnative_struct='-fnative-struct'
	fi
	;;
      *)
	if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
	  msnative_struct='-mms-bitfields'
	fi
	;;
    esac
    if test x"$msnative_struct" = x ; then
      AC_MSG_RESULT([no way])
      AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
    else
      CFLAGS="$CFLAGS $msnative_struct"
      AC_MSG_RESULT([${msnative_struct}])
    fi
  fi
fi

if test "x$os_win32" != "xyes"; then
    # libtool option to control which symbols are exported
    # right now, symbols starting with _ are not exported
    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
else
    # We currently use .def files on Windows
    LIBTOOL_EXPORT_OPTIONS=
fi
AC_SUBST([LIBTOOL_EXPORT_OPTIONS])

# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt

AC_ARG_ENABLE([rebuilds],
              [AC_HELP_STRING([--disable-rebuilds],
                              [disable all source autogeneration rules])], ,
              [enable_rebuilds=yes])

AC_PATH_PROGS([PERL], [perl5 perl])

# We would like indent, but don't require it.
AC_CHECK_PROG([INDENT], [indent], [indent])

REBUILD=\#
if test "x$enable_rebuilds" = "xyes" && \
     test -n "$PERL" && \
     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
  REBUILD=
fi
AC_SUBST([REBUILD])

## Initial sanity check, done here so that users get told they 
## have the wrong dependencies as early in the process as possible.
## Later on we actually use the cflags/libs from separate pkg-config
## calls. Oh, also the later pkg-config calls don't include 
## the version requirements since those make the module lists 
## annoying to construct
PKG_CHECK_MODULES([BASE_DEPENDENCIES], [\
gtk_pkg >= gtk_required_version \
gdk_pkg >= gdk_required_version \
pango_pkg >= pango_required_version \
pangox_pkg >= pangox_required_version \
gmodule_pkg >= gmodule_required_version \
])

# Check for GLib
AM_PATH_GLIB_2_0([glib_required_version], , )

# Check for GTK+
AM_PATH_GTK_2_0([gtk_required_version], , )

# Checks for libraries.

# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([inttypes.h stdlib.h string.h])

# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

# Checks for library functions.
save_LIBS="$LIBS"
LIBS="$LIBS $MATH_LIB"

AC_FUNC_MALLOC
AC_CHECK_FUNCS([memset sqrt strchr strrchr strstr])

LIBS="$save_LIBS"


##################################################
# Checks for GDK multihead support
##################################################

GDKGLEXT_MULTIHEAD_SUPPORT=no

save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BASE_DEPENDENCIES_CFLAGS"
save_LIBS="$LIBS"
LIBS="$LIBS $BASE_DEPENDENCIES_LIBS"

AC_CHECK_HEADERS([gdk/gdkdisplay.h gdk/gdkscreen.h],
                 [GDKGLEXT_MULTIHEAD_SUPPORT=yes],
                 [GDKGLEXT_MULTIHEAD_SUPPORT=no])

if test "x$GDKGLEXT_MULTIHEAD_SUPPORT" = "xyes"; then
  AC_MSG_CHECKING([for gdk_display_get_default in GDK library])
  AC_TRY_LINK([#include <gdk/gdk.h>],
              [gdk_display_get_default();],
              [GDKGLEXT_MULTIHEAD_SUPPORT=yes],
              [GDKGLEXT_MULTIHEAD_SUPPORT=no])
  AC_MSG_RESULT([$GDKGLEXT_MULTIHEAD_SUPPORT])
fi

CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"

if test "x$GDKGLEXT_MULTIHEAD_SUPPORT" = "xyes"; then
  AC_MSG_NOTICE([GDK supports multihead])
else
  AC_MSG_NOTICE([GDK doesn't support multihead])
fi

AC_SUBST([GDKGLEXT_MULTIHEAD_SUPPORT])
AM_CONDITIONAL([MULTIHEAD_SUPPORT],
               [test "x$GDKGLEXT_MULTIHEAD_SUPPORT" = "xyes"])


##################################################
# Checks for GDK functions
##################################################

save_LIBS="$LIBS"
LIBS="$LIBS $BASE_DEPENDENCIES_LIBS"

if test "x$gdktarget" = "xx11"; then
  AC_CHECK_FUNCS([gdk_x11_colormap_foreign_new])
fi

LIBS="$save_LIBS"


##################################################
# Checks for Window System
##################################################

WINDOWING_CFLAGS=""
WINDOWING_LIBS=""

GDKGLEXT_WIN_CFLAGS=""
GDKGLEXT_WIN_LIBS=""

GDKGLEXT_WIN_EXTRA_DEFS=""

if test "x$gdktarget" = "xx11"; then
  AC_PATH_XTRA

  save_CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  save_LIBS="$LIBS"
  LIBS="$LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"

  AC_CHECK_HEADERS([X11/Xmu/StdCmap.h Xmu/StdCmap.h], , ,
                   [#include <X11/Xlib.h>
                    #include <X11/Xutil.h>])

  XMU_LIBS=""
  AC_CHECK_LIB([Xmu], [XmuLookupStandardColormap], , ,
               [-lXt $X_PRE_LIBS])
  if test "x$ac_cv_lib_Xmu_XmuLookupStandardColormap" = "xyes" ; then
    XMU_LIBS="-lXmu -lXt $X_PRE_LIBS"
  fi

  WINDOWING_CFLAGS="$X_CFLAGS"
  WINDOWING_LIBS="$X_LIBS $XMU_LIBS -lXext -lX11 $X_EXTRA_LIBS"

  GDKGLEXT_WIN_CFLAGS="$X_CFLAGS"
  GDKGLEXT_WIN_LIBS="$X_LIBS $XMU_LIBS"

  CPPFLAGS="$save_CPPFLAGS"
  LIBS="$save_LIBS"

  AM_CONDITIONAL([USE_X11], [true])
else
  AM_CONDITIONAL([USE_X11], [false])
fi

if test "x$gdktarget" = "xwin32"; then
  WINDOWING_LIBS="-lgdi32 -luser32 -lkernel32"
  GDKGLEXT_WIN_LIBS="-lgdi32 -lus...
 
[truncated message content]

[openvrml-commit] openvrml/lib/gtkglext/gdk/glext .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/glext
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/gdk/glext

Modified Files:
	Makefile.am 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/glext/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:08 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 22,25 ****
  
  gdkglextglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/glext
! gdkglextglextinclude_HEADERS = $(gdkglext_glext_public_h_sources)
  
--- 22,25 ----
  
  gdkglextglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/glext
! noinst_HEADERS = $(gdkglext_glext_public_h_sources)
  

[openvrml-commit] openvrml/lib/gtkglext/gdk .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2 gdkglconfig.c, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/gdk

Modified Files:
	Makefile.am gdkglconfig.c 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in

Index: gdkglconfig.c
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/gdkglconfig.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdkglconfig.c	27 Sep 2006 00:16:06 -0000	1.1.1.1
--- gdkglconfig.c	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 34,41 ****
--- 34,47 ----
  gdk_gl_config_get_type (void)
  {
+   static const char type_name[] = "GdkGLConfig";
    static GType type = 0;
  
    if (!type)
      {
+       type = g_type_from_name(type_name);
+     }
+ 
+   if (!type)
+     {
        static const GTypeInfo type_info = {
          sizeof (GdkGLConfigClass),
***************
*** 51,55 ****
  
        type = g_type_register_static (G_TYPE_OBJECT,
!                                      "GdkGLConfig",
                                       &type_info, 0);
      }
--- 57,61 ----
  
        type = g_type_register_static (G_TYPE_OBJECT,
!                                      type_name,
                                       &type_info, 0);
      }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:06 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 63,71 ****
  # setup source file variables
  #
  
  gdkglext_public_h_sources = \
  	gdkgl.h			\
  	gdkgldefs.h		\
- 	gdkglversion.h		\
  	gdkgltokens.h		\
  	gdkgltypes.h		\
--- 63,71 ----
  # setup source file variables
  #
+ gdkglext_configure_generated_public_h_source = gdkglversion.h
  
  gdkglext_public_h_sources = \
  	gdkgl.h			\
  	gdkgldefs.h		\
  	gdkgltokens.h		\
  	gdkgltypes.h		\
***************
*** 103,108 ****
  
  gdkglext_headers = \
! 	$(gdkglext_public_h_sources)		\
! 	$(gdkglext_built_public_h_sources)	\
  	gdkgldebug.h
  
--- 103,109 ----
  
  gdkglext_headers = \
! 	$(gdkglext_public_h_sources)			\
! 	$(gdkglext_built_public_h_sources)		\
! 	$(gdkglext_configure_generated_public_h_source)	\
  	gdkgldebug.h
  
***************
*** 124,132 ****
  
  gdkglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk
! gdkglextinclude_HEADERS = $(gdkglext_headers)
  
  INCLUDES = $(common_includes)
  
! lib_LTLIBRARIES = $(gdkglext_targetlib)
  
  EXTRA_LTLIBRARIES = \
--- 125,133 ----
  
  gdkglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk
! noinst_HEADERS = $(gdkglext_headers)
  
  INCLUDES = $(common_includes)
  
! noinst_LTLIBRARIES = $(gdkglext_targetlib)
  
  EXTRA_LTLIBRARIES = \
***************
*** 147,172 ****
  	$(gdkglext_built_sources)
  
! DISTCLEANFILES = $(stamp_files)
! 
! MAINTAINERCLEANFILES = \
! 	$(gdkglext_built_sources)
  
  # Generate built header without using automake BUILT_SOURCES
  $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@API_MI@_la_OBJECTS): $(gdkglext_built_public_h_sources)
  
! $(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h
  	@true
  stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! 	( cd $(srcdir) && glib-mkenums \
  			--fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
  			--fprod "/* enumerations from \"@filename@\" */\n" \
  			--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
  			--ftail "G_END_DECLS\n\n#endif /* __GDK_GL_ENUM_TYPES_H__ */" \
! 		$(gdkglext_public_h_sources) ) >> xgen-geth \
! 	&& (cmp -s xgen-geth $(srcdir)/gdkglenumtypes.h || cp xgen-geth $(srcdir)/gdkglenumtypes.h ) \
  	&& rm -f xgen-geth \
  	&& echo timestamp > $(@F)
! $(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! 	( cd $(srcdir) && glib-mkenums \
  			--fhead "#include \"gdkgl.h\"" \
  			--fprod "\n/* enumerations from \"@filename@\" */" \
--- 148,170 ----
  	$(gdkglext_built_sources)
  
! DISTCLEANFILES = $(stamp_files) $(gdkglext_built_sources)
  
  # Generate built header without using automake BUILT_SOURCES
  $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@API_MI@_la_OBJECTS): $(gdkglext_built_public_h_sources)
  
! gdkglenumtypes.h: stamp-gdkglenumtypes-h
  	@true
  stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! 	builddir=`pwd`; ( cd $(srcdir) && glib-mkenums \
  			--fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
  			--fprod "/* enumerations from \"@filename@\" */\n" \
  			--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
  			--ftail "G_END_DECLS\n\n#endif /* __GDK_GL_ENUM_TYPES_H__ */" \
! 		$(gdkglext_public_h_sources) $${builddir}/$(gdkglext_configure_generated_public_h_source) ) >> xgen-geth \
! 	&& (cmp -s xgen-geth gdkglenumtypes.h || cp xgen-geth gdkglenumtypes.h ) \
  	&& rm -f xgen-geth \
  	&& echo timestamp > $(@F)
! gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! 	builddir=`pwd`; ( cd $(srcdir) && glib-mkenums \
  			--fhead "#include \"gdkgl.h\"" \
  			--fprod "\n/* enumerations from \"@filename@\" */" \
***************
*** 174,179 ****
  			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
  			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
! 		$(gdkglext_public_h_sources) ) > xgen-getc \
! 	&& cp xgen-getc $(srcdir)/gdkglenumtypes.c  \
  	&& rm -f xgen-getc
  
--- 172,177 ----
  			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
  			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
! 		$(gdkglext_public_h_sources) $${builddir}/$(gdkglext_configure_generated_public_h_source) ) > xgen-getc \
! 	&& cp xgen-getc $@  \
  	&& rm -f xgen-getc
  
***************
*** 184,193 ****
  #configexecinclude_DATA = gdkglext-config.h
  
- install-exec-local: gdkglext-config.h
- 	$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
- 	file=$(DESTDIR)$(configexecincludedir)/gdkglext-config.h; \
- 	if test -r $$file && cmp -s gdkglext-config.h $$file; then :; \
- 	else $(INSTALL_DATA) gdkglext-config.h $$file; fi
- 
  gdkglext-config.h: stamp-gdkglext-config-h
  	@if test -f gdkglext-config.h; then :; \
--- 182,185 ----
***************
*** 199,209 ****
  
  DISTCLEANFILES += gdkglext-config.h stamp-gdkglext-config-h
- 
- #
- # Extra rules
- #
- 
- install-data-local: install-ms-lib
- 
- uninstall-local: uninstall-ms-lib
- 
--- 191,192 ----

[openvrml-commit] openvrml/lib/gtkglext/docs/reference/gtkglext/tmpl gdkglcontext.sgml, 1.1.1.1, 1.2 gdkglversion.sgml, 1.1.1.1, 1.2 gtkglext-unused.sgml, 1.1.1.1, 1.2 gtkglversion.sgml, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/tmpl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/docs/reference/gtkglext/tmpl

Modified Files:
	gdkglcontext.sgml gdkglversion.sgml gtkglext-unused.sgml 
	gtkglversion.sgml 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: gtkglext-unused.sgml
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglext-unused.sgml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gtkglext-unused.sgml	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- gtkglext-unused.sgml	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 0 ****
--- 1,138 ----
+ <!-- ##### MACRO GDKGLEXT_BINARY_AGE ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GDKGLEXT_CHECK_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ @major: 
+ @minor: 
+ @micro: 
+ 
+ <!-- ##### MACRO GDKGLEXT_INTERFACE_AGE ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GDKGLEXT_MAJOR_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GDKGLEXT_MICRO_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GDKGLEXT_MINOR_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GTKGLEXT_BINARY_AGE ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GTKGLEXT_CHECK_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ @major: 
+ @minor: 
+ @micro: 
+ 
+ <!-- ##### MACRO GTKGLEXT_INTERFACE_AGE ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GTKGLEXT_MAJOR_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GTKGLEXT_MICRO_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### MACRO GTKGLEXT_MINOR_VERSION ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gdkglext_binary_age ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gdkglext_interface_age ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gdkglext_major_version ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gdkglext_micro_version ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gdkglext_minor_version ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gtkglext_binary_age ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gtkglext_interface_age ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gtkglext_major_version ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gtkglext_micro_version ##### -->
+ <para>
+ 
+ </para>
+ 
+ 
+ <!-- ##### VARIABLE gtkglext_minor_version ##### -->
+ <para>
+ 
+ </para>
+ 
+ 

Index: gdkglversion.sgml
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglversion.sgml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdkglversion.sgml	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- gdkglversion.sgml	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 18,94 ****
  
  
- <!-- ##### MACRO GDKGLEXT_MAJOR_VERSION ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GDKGLEXT_MINOR_VERSION ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GDKGLEXT_MICRO_VERSION ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GDKGLEXT_INTERFACE_AGE ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GDKGLEXT_BINARY_AGE ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GDKGLEXT_CHECK_VERSION ##### -->
- <para>
- 
- </para>
- 
- @major: 
- @minor: 
- @micro: 
- 
- 
- <!-- ##### VARIABLE gdkglext_major_version ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gdkglext_minor_version ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gdkglext_micro_version ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gdkglext_interface_age ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gdkglext_binary_age ##### -->
- <para>
- 
- </para>
- 
- 
--- 18,19 ----

Index: gdkglcontext.sgml
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglcontext.sgml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdkglcontext.sgml	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- gdkglcontext.sgml	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 53,58 ****
  @Param3: 
  @Returns: 
- <!-- # Unused Parameters # -->
- @mask: 
  
  
--- 53,56 ----

Index: gtkglversion.sgml
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglversion.sgml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gtkglversion.sgml	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- gtkglversion.sgml	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 18,94 ****
  
  
- <!-- ##### MACRO GTKGLEXT_MAJOR_VERSION ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GTKGLEXT_MINOR_VERSION ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GTKGLEXT_MICRO_VERSION ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GTKGLEXT_INTERFACE_AGE ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GTKGLEXT_BINARY_AGE ##### -->
- <para>
- 
- </para>
- 
- 
- 
- <!-- ##### MACRO GTKGLEXT_CHECK_VERSION ##### -->
- <para>
- 
- </para>
- 
- @major: 
- @minor: 
- @micro: 
- 
- 
- <!-- ##### VARIABLE gtkglext_major_version ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gtkglext_minor_version ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gtkglext_micro_version ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gtkglext_interface_age ##### -->
- <para>
- 
- </para>
- 
- 
- <!-- ##### VARIABLE gtkglext_binary_age ##### -->
- <para>
- 
- </para>
- 
- 
--- 18,19 ----

[openvrml-commit] openvrml/lib/gtkglext/docs/reference/gtkglext .cvsignore, 1.1, 1.2 gtkglext-overrides.txt, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/docs/reference/gtkglext

Modified Files:
	Makefile.am 
Added Files:
	.cvsignore gtkglext-overrides.txt 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in
gtkglext-decl.txt
gtkglext-decl-list.txt
gtkglext-undocumented.txt
gtkglext-unused.txt
gtkglext.args
gtkglext.hierarchy
gtkglext.interfaces
gtkglext.prerequisites
gtkglext.signals
html
html.stamp
sgml.stamp
tmpl.stamp
version.xml
xml

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/docs/reference/gtkglext/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 2,5 ****
--- 2,19 ----
  ## Makefile.am for gtkglext/docs/reference/gtkglext
  
+ GTKDOC_CFLAGS = \
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/gdk		\
+ 	-I$(top_srcdir)/gtk		\
+ 	-I$(top_builddir)		\
+ 	-I$(top_builddir)/gdk		\
+ 	-I$(top_builddir)/gtk		\
+ 	$(GTKGLEXT_DEBUG_FLAGS)		\
+ 	$(GTKGLEXT_DEP_CFLAGS)
+ 
+ GTKDOC_LIBS = \
+ 	$(top_builddir)/gdk/$(gdkglext_targetlib)	\
+ 	$(top_builddir)/gtk/$(gtkglext_targetlib)
+ 
  # The name of the module, e.g. 'glib'.
  DOC_MODULE = gtkglext
***************
*** 53,57 ****
  # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
  content_files = \
! 	version.xml	\
  	building.sgml	\
  	running.sgml
--- 67,71 ----
  # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
  content_files = \
! 	$(top_srcdir)/docs/reference/gtkglext/version.xml	\
  	building.sgml	\
  	running.sgml
***************
*** 61,211 ****
  	version.xml.in
  
! # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
! # contains GtkObjects/GObjects and you want to document signals and properties.
! GTKDOC_CFLAGS = \
! 	@CFLAGS@			\
! 	-I$(top_srcdir)			\
! 	-I$(top_srcdir)/gdk		\
! 	-I$(top_srcdir)/gtk		\
! 	-I$(top_builddir)/gdk		\
! 	-I$(top_builddir)/gtk		\
! 	$(GTKGLEXT_DEBUG_FLAGS)		\
! 	$(GTKGLEXT_DEP_CFLAGS)
! 
! GTKDOC_LIBS = \
! 	$(top_builddir)/gdk/$(gdkglext_targetlib)	\
! 	$(top_builddir)/gtk/$(gtkglext_targetlib)
! 
! GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
! GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
! 
! # If you need to override some of the declarations, place them in the
! # $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
! DOC_OVERRIDES =
! #DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
! 
! 
! 
! ###########################################################################
! # Everything below here is generic and you shouldn't need to change it.
! ###########################################################################
! 
! TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
! 
! EXTRA_DIST = 				\
! 	$(content_files)		\
! 	$(extra_files)			\
! 	$(HTML_IMAGES)			\
! 	$(DOC_MAIN_SGML_FILE)		\
! 	$(DOC_MODULE).types		\
! 	$(DOC_MODULE)-sections.txt	\
! 	$(DOC_OVERRIDES)
! 
! DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
! 	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
! 
! SCANOBJ_FILES = 			\
! 	$(DOC_MODULE).args 		\
! 	$(DOC_MODULE).hierarchy 	\
! 	$(DOC_MODULE).interfaces	\
! 	$(DOC_MODULE).prerequisites	\
! 	$(DOC_MODULE).signals
! 
! if ENABLE_GTK_DOC
! all-local: html-build.stamp
! 
! #### scan ####
! 
! scan-build.stamp: $(HFILE_GLOB)
! 	@echo '*** Scanning header files ***'
! 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
! 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
! 	else \
! 	    cd $(srcdir) ; \
! 	    for i in $(SCANOBJ_FILES) ; do \
!                test -f $$i || touch $$i ; \
! 	    done \
! 	fi
! 	cd $(srcdir) && \
! 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
! 	touch scan-build.stamp
! 
! $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
! 	@true
! 
! #### templates ####
! 
! tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)
! 	@echo '*** Rebuilding template files ***'
! 	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
! 	touch tmpl-build.stamp
! 
! tmpl.stamp: tmpl-build.stamp
! 	@true
! 
! #### sgml ####
! 
! sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
! 	@echo '*** Building SGML ***'
! 	cd $(srcdir) && \
! 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
! 	touch sgml-build.stamp
! 
! sgml.stamp: sgml-build.stamp
! 	@true
! 
! #### html ####
! 
! html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
! 	@echo '*** Building HTML ***'
! 	test -d $(srcdir)/html || mkdir $(srcdir)/html
! 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
! 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
! 	@echo '-- Fixing Crossreferences' 
! 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
! 	touch html-build.stamp
! endif
! 
! ##############
! 
! clean-local:
! 	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
! 
! maintainer-clean-local: clean
! 	cd $(srcdir) && rm -rf sgml xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
! 
! install-data-local:
! 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
! 	(installfiles=`echo $(srcdir)/html/*`; \
! 	if test "$$installfiles" = '$(srcdir)/html/*'; \
! 	then echo '-- Nothing to install' ; \
! 	else \
! 	  for i in $$installfiles; do \
! 	    echo '-- Installing '$$i ; \
! 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
! 	  done; \
! 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
! 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
! 	fi)
! 
! #
! # Require gtk-doc when making dist
! #
! if ENABLE_GTK_DOC
! dist-check-gtkdoc:
! else
! dist-check-gtkdoc:
! 	@echo "*** gtk-doc must be installed and enabled in order to make dist"
! 	@false
! endif
! 
! dist-hook: dist-check-gtkdoc dist-hook-local
! 	mkdir $(distdir)/tmpl
! 	mkdir $(distdir)/xml
! 	mkdir $(distdir)/html
! 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
! 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
! 	-cp $(srcdir)/html/* $(distdir)/html
! 
! .PHONY : dist-hook-local
  
--- 75,80 ----
  	version.xml.in
  
! $(top_srcdir)/docs/reference/gtkglext/version.xml:
! 	cp $(top_builddir)/docs/reference/gtkglext/version.xml $@
  
+ include $(top_srcdir)/gtk-doc.make

--- NEW FILE: gtkglext-overrides.txt ---

[openvrml-commit] openvrml/lib/gtkglext/gdk/win32 .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/win32
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/gdk/win32

Modified Files:
	Makefile.am 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/win32/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:08 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 48,52 ****
  
  gdkglextwin32includedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/win32
! gdkglextwin32include_HEADERS = $(gdkglext_win32_headers)
  
  noinst_LTLIBRARIES = libgdkglext-win32.la
--- 48,52 ----
  
  gdkglextwin32includedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/win32
! noinst_HEADERS = $(gdkglext_win32_headers)
  
  noinst_LTLIBRARIES = libgdkglext-win32.la

[openvrml-commit] openvrml/lib/gtkglext/gtk .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gtk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/gtk

Modified Files:
	Makefile.am 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gtk/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:11 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 87,95 ****
  
  gtkglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gtk
! gtkglextinclude_HEADERS = $(gtkglext_headers)
  
  INCLUDES = $(common_includes)
  
! lib_LTLIBRARIES = $(gtkglext_targetlib)
  
  EXTRA_LTLIBRARIES = \
--- 87,95 ----
  
  gtkglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gtk
! noinst_HEADERS = $(gtkglext_headers)
  
  INCLUDES = $(common_includes)
  
! noinst_LTLIBRARIES = $(gtkglext_targetlib)
  
  EXTRA_LTLIBRARIES = \
***************
*** 105,115 ****
  libgtkglext_win32_@API_MJ@_@API_MI@_la_LIBADD = $(common_libadd)
  libgtkglext_win32_@API_MJ@_@API_MI@_la_DEPENDENCIES = $(gtkglext_def)
- 
- #
- # Extra rules
- #
- 
- install-data-local: install-ms-lib
- 
- uninstall-local: uninstall-ms-lib
- 
--- 105,106 ----

[openvrml-commit] openvrml/lib/gtkglext/gdk/x11 .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2 gdkglconfig-x11.c, 1.1.1.1, 1.2 gdkglquery-x11.c, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/gdk/x11

Modified Files:
	Makefile.am gdkglconfig-x11.c gdkglquery-x11.c 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 50,54 ****
  
  gdkglextx11includedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/x11
! gdkglextx11include_HEADERS = $(gdkglext_x11_headers)
  
  noinst_LTLIBRARIES = libgdkglext-x11.la
--- 50,54 ----
  
  gdkglextx11includedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/x11
! noinst_HEADERS = $(gdkglext_x11_headers)
  
  noinst_LTLIBRARIES = libgdkglext-x11.la

Index: gdkglconfig-x11.c
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11/gdkglconfig-x11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdkglconfig-x11.c	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- gdkglconfig-x11.c	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 65,69 ****
          sizeof (GdkGLConfigImplX11),
          0,                      /* n_preallocs */
!         (GInstanceInitFunc) NULL
        };
  
--- 65,70 ----
          sizeof (GdkGLConfigImplX11),
          0,                      /* n_preallocs */
!         (GInstanceInitFunc) NULL,
! 	(const GTypeValueTable *) NULL
        };
  

Index: gdkglquery-x11.c
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11/gdkglquery-x11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdkglquery-x11.c	27 Sep 2006 00:16:09 -0000	1.1.1.1
--- gdkglquery-x11.c	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 406,410 ****
        if (glx_get_proc_address != NULL)
          {
!           proc_address = glx_get_proc_address (proc_name);
            GDK_GL_NOTE (IMPL, g_message (" ** glXGetProcAddress () - %s",
                                          proc_address ? "succeeded" : "failed"));
--- 406,410 ----
        if (glx_get_proc_address != NULL)
          {
!           proc_address = glx_get_proc_address ((const GLubyte *) proc_name);
            GDK_GL_NOTE (IMPL, g_message (" ** glXGetProcAddress () - %s",
                                          proc_address ? "succeeded" : "failed"));

[openvrml-commit] openvrml ChangeLog, 1.1336, 1.1337 README, 1.65, 1.66 bootstrap, 1.1, 1.2 configure-gcc-dbg, 1.1, 1.2 configure-gcc-opt, 1.1, 1.2 configure.ac, 1.93, 1.94 openvrml.spec.in, 1.53, 1.54

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480

Modified Files:
	ChangeLog README bootstrap configure-gcc-dbg configure-gcc-opt 
	configure.ac openvrml.spec.in 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: openvrml.spec.in
===================================================================
RCS file: /cvsroot/openvrml/openvrml/openvrml.spec.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** openvrml.spec.in	14 Aug 2006 05:43:16 -0000	1.53
--- openvrml.spec.in	1 Oct 2006 05:46:54 -0000	1.54
***************
*** 59,64 ****
  using the OpenVRML OpenGL renderer.
  
! %package mozilla-plugin
! Summary:        VRML browser plug-in for Mozilla-based browsers.
  Group:          Applications/Internet
  License:        GPL
--- 59,64 ----
  using the OpenVRML OpenGL renderer.
  
! %package gtkplug
! Summary:        VRML browser GtkPlug component for embedding in GTK+ applications.
  Group:          Applications/Internet
  License:        GPL
***************
*** 66,69 ****
--- 66,77 ----
  Requires:       gtk2
  Requires:       libXmu
+ %description gtkplug
+ VRML browser GtkPlug component for embedding in GTK+ applications.
+ 
+ %package mozilla-plugin
+ Summary:        VRML browser plug-in for Mozilla-based browsers.
+ Group:          Applications/Internet
+ License:        GPL
+ Requires:       %{name}-gtkplug = %{version}
  Requires:       mozilla >= 1.6
  %description mozilla-plugin
***************
*** 113,125 ****
  %{_libdir}/pkgconfig/openvrml-gl.pc
  
  %files mozilla-plugin
  %doc AUTHORS COPYING ChangeLog NEWS README THANKS
  %{_libdir}/mozilla/plugins/openvrml.so
  %{_libdir}/mozilla/plugins/openvrml.xpt
- %{_libexecdir}/openvrml-player
  %{_datadir}/idl/%{name}-%{version}/openvrml.idl
  
  
  %changelog
  * Mon Aug 14 2006  Braden McDaniel  <br...@en...>
  - Added libXmu-devel to BuildRequires.
--- 121,139 ----
  %{_libdir}/pkgconfig/openvrml-gl.pc
  
+ %files gtkplug
+ %doc AUTHORS COPYING ChangeLog NEWS README THANKS
+ %{_libexecdir}/openvrml-gtkplug
+ 
  %files mozilla-plugin
  %doc AUTHORS COPYING ChangeLog NEWS README THANKS
  %{_libdir}/mozilla/plugins/openvrml.so
  %{_libdir}/mozilla/plugins/openvrml.xpt
  %{_datadir}/idl/%{name}-%{version}/openvrml.idl
  
  
  %changelog
+ * Thu Sep 28 2006  Braden McDaniel  <br...@en...>
+ - Added openvrml-gtkplug package.
+ 
  * Mon Aug 14 2006  Braden McDaniel  <br...@en...>
  - Added libXmu-devel to BuildRequires.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1336
retrieving revision 1.1337
diff -C2 -d -r1.1336 -r1.1337
*** ChangeLog	28 Sep 2006 02:16:27 -0000	1.1336
--- ChangeLog	1 Oct 2006 05:46:54 -0000	1.1337
***************
*** 1,2 ****
--- 1,545 ----
+ 2006-10-01 Braden McDaniel  <br...@en...>
+ 
+ 	Build/package the GtkPlug application separately from the Mozilla
+ 	plug-in.  The Mozilla plug-in is just one possible client for this
+ 	application.
+ 
+ 	* README: Changed OPENVRML_PLAYER variable to OPENVRML_GTKPLUG.
+ 	* configure.ac: Output makefile for openvrml-gtkplug; check for
+ 	GTK+; added --disable-gtkplug option; added lib/gtkglext
+ 	subpackage.
+ 	* openvrml.spec.in: Added openvrml-gtkplug package.
+ 	* lib/Makefile.am (SUBDIRS): Added gtkglext.
+ 	* lib/gtkglext/AUTHORS: Added file.
+ 	* lib/gtkglext/COPYING: Added file.
+ 	* lib/gtkglext/COPYING.LIB: Added file.
+ 	* lib/gtkglext/ChangeLog: Added file.
+ 	* lib/gtkglext/ChangeLog.pre-1-0: Added file.
+ 	* lib/gtkglext/INSTALL: Added file.
+ 	* lib/gtkglext/Makefile.am: Added file.
+ 	* lib/gtkglext/NEWS: Added file.
+ 	* lib/gtkglext/README: Added file.
+ 	* lib/gtkglext/README.win32: Added file.
+ 	* lib/gtkglext/TODO: Added file.
+ 	* lib/gtkglext/configure.in: Added file.
+ 	* lib/gtkglext/gdkglext-uninstalled.pc.in: Added file.
+ 	* lib/gtkglext/gdkglext.pc.in: Added file.
+ 	* lib/gtkglext/gtkglext-uninstalled.pc.in: Added file.
+ 	* lib/gtkglext/gtkglext.nsi.in: Added file.
+ 	* lib/gtkglext/gtkglext.pc.in: Added file.
+ 	* lib/gtkglext/gtkglext.spec.in: Added file.
+ 	* lib/gtkglext/setup-gtkglext.sh: Added file.
+ 	* lib/gtkglext/docs/Makefile.am: Added file.
+ 	* lib/gtkglext/docs/reference/Makefile.am: Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/Makefile.am: Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/building.sgml: Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/gtkglext-docs.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/gtkglext-overrides.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/gtkglext-sections.txt:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/gtkglext.types: Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/running.sgml: Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/version.xml.in: Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgl.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglconfig.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglcontext.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgldefs.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgldrawable.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglfont.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglinit.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglpixmap.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglquery.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglshapes.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgltokens.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglversion.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglwindow.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglx.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gtkgl.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gtkgldefs.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglext-unused.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglinit.sgml: Added
+ 	file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglversion.sgml:
+ 	Added file.
+ 	* lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglwidget.sgml:
+ 	Added file.
+ 	* lib/gtkglext/examples/Makefile.am: Added file.
+ 	* lib/gtkglext/examples/Makefile.mingw: Added file.
+ 	* lib/gtkglext/examples/Makefile.msc: Added file.
+ 	* lib/gtkglext/examples/alien.lwo: Added file.
+ 	* lib/gtkglext/examples/button.c: Added file.
+ 	* lib/gtkglext/examples/color.c: Added file.
+ 	* lib/gtkglext/examples/coolwave.c: Added file.
+ 	* lib/gtkglext/examples/coolwave2.c: Added file.
+ 	* lib/gtkglext/examples/font-pangoft2-tex.c: Added file.
+ 	* lib/gtkglext/examples/font-pangoft2.c: Added file.
+ 	* lib/gtkglext/examples/font.c: Added file.
+ 	* lib/gtkglext/examples/gears.c: Added file.
+ 	* lib/gtkglext/examples/girl.rgb: Added file.
+ 	* lib/gtkglext/examples/glxinfo.c: Added file.
+ 	* lib/gtkglext/examples/logo-g.c: Added file.
+ 	* lib/gtkglext/examples/logo-k.c: Added file.
+ 	* lib/gtkglext/examples/logo-model.c: Added file.
+ 	* lib/gtkglext/examples/logo-model.h: Added file.
+ 	* lib/gtkglext/examples/logo-t.c: Added file.
+ 	* lib/gtkglext/examples/logo.c: Added file.
+ 	* lib/gtkglext/examples/low-level.c: Added file.
+ 	* lib/gtkglext/examples/lw.c: Added file.
+ 	* lib/gtkglext/examples/lw.h: Added file.
+ 	* lib/gtkglext/examples/multiarb.c: Added file.
+ 	* lib/gtkglext/examples/penguin.lwo: Added file.
+ 	* lib/gtkglext/examples/pixmap-mixed.c: Added file.
+ 	* lib/gtkglext/examples/pixmap.c: Added file.
+ 	* lib/gtkglext/examples/readtex.c: Added file.
+ 	* lib/gtkglext/examples/readtex.h: Added file.
+ 	* lib/gtkglext/examples/reflect.rgb: Added file.
+ 	* lib/gtkglext/examples/rotating-square.c: Added file.
+ 	* lib/gtkglext/examples/scribble-gl.c: Added file.
+ 	* lib/gtkglext/examples/shapes.c: Added file.
+ 	* lib/gtkglext/examples/share-lists.c: Added file.
+ 	* lib/gtkglext/examples/simple-mixed.c: Added file.
+ 	* lib/gtkglext/examples/simple-pbuffer-sgix.c: Added file.
+ 	* lib/gtkglext/examples/simple.c: Added file.
+ 	* lib/gtkglext/examples/template.c: Added file.
+ 	* lib/gtkglext/examples/trackball.c: Added file.
+ 	* lib/gtkglext/examples/trackball.h: Added file.
+ 	* lib/gtkglext/examples/viewlw.c: Added file.
+ 	* lib/gtkglext/examples/wglinfo.c: Added file.
+ 	* lib/gtkglext/examples/glade/Makefile.am: Added file.
+ 	* lib/gtkglext/examples/glade/README: Added file.
+ 	* lib/gtkglext/examples/glade/share-lists.c: Added file.
+ 	* lib/gtkglext/examples/glade/share-lists.glade: Added file.
+ 	* lib/gtkglext/examples/glade/simple.c: Added file.
+ 	* lib/gtkglext/examples/glade/simple.glade: Added file.
+ 	* lib/gtkglext/gdk/Makefile.am: Added file.
+ 	* lib/gtkglext/gdk/gdkgl.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglconfig.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglconfig.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglcontext.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglcontext.h: Added file.
+ 	* lib/gtkglext/gdk/gdkgldebug.h: Added file.
+ 	* lib/gtkglext/gdk/gdkgldefs.h: Added file.
+ 	* lib/gtkglext/gdk/gdkgldrawable.c: Added file.
+ 	* lib/gtkglext/gdk/gdkgldrawable.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglenumtypes.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglenumtypes.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglext-gtk20.def: Added file.
+ 	* lib/gtkglext/gdk/gdkglext.def: Added file.
+ 	* lib/gtkglext/gdk/gdkglfont.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglglext.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglglext.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglinit.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglinit.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglpixmap.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglpixmap.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglprivate.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglquery.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglquery.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglshapes.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglshapes.h: Added file.
+ 	* lib/gtkglext/gdk/gdkgltokens.h: Added file.
+ 	* lib/gtkglext/gdk/gdkgltypes.h: Added file.
+ 	* lib/gtkglext/gdk/gdkglversion.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglversion.h.in: Added file.
+ 	* lib/gtkglext/gdk/gdkglwindow.c: Added file.
+ 	* lib/gtkglext/gdk/gdkglwindow.h: Added file.
+ 	* lib/gtkglext/gdk/glext/Makefile.am: Added file.
+ 	* lib/gtkglext/gdk/glext/README: Added file.
+ 	* lib/gtkglext/gdk/glext/common-header.h: Added file.
+ 	* lib/gtkglext/gdk/glext/gen-gdkglglext-c.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/gen-gdkglglext-h.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/gen-gdkglglxext-c.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/gen-gdkglglxext-h.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/gen-gdkglwglext-c.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/gen-gdkglwglext-h.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/glext-extra.h: Added file.
+ 	* lib/gtkglext/gdk/glext/glext.h: Added file.
+ 	* lib/gtkglext/gdk/glext/glxext-extra.h: Added file.
+ 	* lib/gtkglext/gdk/glext/glxext.h: Added file.
+ 	* lib/gtkglext/gdk/glext/list-ext.pl: Added file.
+ 	* lib/gtkglext/gdk/glext/wglext-extra.h: Added file.
+ 	* lib/gtkglext/gdk/glext/wglext.h: Added file.
+ 	* lib/gtkglext/gdk/win32/Makefile.am: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglconfig-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglconfig-win32.h: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglcontext-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglcontext-win32.h: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkgldrawable-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglfont-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglpixmap-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglpixmap-win32.h: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglprivate-win32.h: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglquery-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglwglext.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglwglext.h: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglwin32.h: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglwindow-win32.c: Added file.
+ 	* lib/gtkglext/gdk/win32/gdkglwindow-win32.h: Added file.
+ 	* lib/gtkglext/gdk/x11/Makefile.am: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglconfig-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglconfig-x11.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglcontext-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglcontext-x11.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkgldrawable-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglfont-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglglxext.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglglxext.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkgloverlay-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkgloverlay-x11.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglpixmap-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglpixmap-x11.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglprivate-x11.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglquery-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglwindow-x11.c: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglwindow-x11.h: Added file.
+ 	* lib/gtkglext/gdk/x11/gdkglx.h: Added file.
+ 	* lib/gtkglext/gtk/Makefile.am: Added file.
+ 	* lib/gtkglext/gtk/gtkgl.h: Added file.
+ 	* lib/gtkglext/gtk/gtkgldebug.h: Added file.
+ 	* lib/gtkglext/gtk/gtkgldefs.h: Added file.
+ 	* lib/gtkglext/gtk/gtkglext.def: Added file.
+ 	* lib/gtkglext/gtk/gtkglinit.c: Added file.
+ 	* lib/gtkglext/gtk/gtkglinit.h: Added file.
+ 	* lib/gtkglext/gtk/gtkglprivate.h: Added file.
+ 	* lib/gtkglext/gtk/gtkglversion.c: Added file.
+ 	* lib/gtkglext/gtk/gtkglversion.h.in: Added file.
+ 	* lib/gtkglext/gtk/gtkglwidget.c: Added file.
+ 	* lib/gtkglext/gtk/gtkglwidget.h: Added file.
+ 	* lib/gtkglext/m4macros/Makefile.am: Added file.
+ 	* lib/gtkglext/m4macros/gtkglext.m4: Added file.
+ 	* mozilla-plugin/Makefile.am (SUBDIRS): Removed reference to lib
+ 	subdirectory.
+ 	* mozilla-plugin/configure.ac: Removed references to lib/gtkglext
+ 	subpackage; removed references to openvrml-player.
+ 	* mozilla-plugin/lib/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/AUTHORS: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/COPYING: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/COPYING.LIB: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/ChangeLog: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/ChangeLog.pre-1-0: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/INSTALL: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/NEWS: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/README: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/README.win32: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/TODO: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/autogen.sh: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/configure.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdkglext-uninstalled.pc.in: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdkglext.pc.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtkglext-uninstalled.pc.in: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gtkglext.nsi.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtkglext.pc.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtkglext.spec.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/make-copyright.sh: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/setup-gtkglext.sh: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/Makefile.am: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/Makefile.am:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/building.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/gtkglext-decl-list.txt:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/gtkglext-decl.txt:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/gtkglext-docs.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/gtkglext-sections.txt:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/gtkglext-undocumented.txt:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/gtkglext.types:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/running.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/version.xml.in:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgl.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglconfig.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglcontext.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgldefs.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgldrawable.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglfont.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglinit.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglpixmap.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglquery.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglshapes.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkgltokens.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglversion.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglwindow.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gdkglx.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkgl.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkgldefs.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglext-unused.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglinit.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglversion.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/docs/reference/gtkglext/tmpl/gtkglwidget.sgml:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/Makefile.mingw: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/Makefile.msc: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/alien.lwo: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/button.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/color.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/coolwave.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/coolwave2.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/font-pangoft2-tex.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/font-pangoft2.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/font.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/gears.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/girl.rgb: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glxinfo.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/logo-g.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/logo-k.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/logo-model.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/logo-model.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/logo-t.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/logo.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/low-level.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/lw.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/lw.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/multiarb.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/penguin.lwo: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/pixmap-mixed.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/pixmap.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/readtex.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/readtex.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/reflect.rgb: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/rotating-square.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/scribble-gl.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/shapes.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/share-lists.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/simple-mixed.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/simple-pbuffer-sgix.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/simple.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/template.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/trackball.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/trackball.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/viewlw.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/wglinfo.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glade/Makefile.am: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glade/README: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glade/share-lists.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glade/share-lists.glade:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glade/simple.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/examples/glade/simple.glade: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgl.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglconfig.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglconfig.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglcontext.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglcontext.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgldebug.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgldefs.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgldrawable.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgldrawable.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglext-gtk20.def: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglext.def: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglfont.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglglext.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglglext.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglinit.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglinit.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglpixmap.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglpixmap.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglprivate.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglquery.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglquery.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglshapes.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglshapes.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgltokens.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkgltypes.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglversion.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglversion.h.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglwindow.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gdkglwindow.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/gen-def-file.sh: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/README: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/common-header.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/gen-gdkglglext-c.pl:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/gen-gdkglglext-h.pl:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/gen-gdkglglxext-c.pl:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/gen-gdkglglxext-h.pl:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/gen-gdkglwglext-c.pl:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/gen-gdkglwglext-h.pl:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/glext-extra.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/glext.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/glxext-extra.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/glxext.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/list-ext.pl: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/wglext-extra.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/glext/wglext.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglconfig-win32.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglconfig-win32.h:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglcontext-win32.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglcontext-win32.h:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkgldrawable-win32.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglfont-win32.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglpixmap-win32.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglpixmap-win32.h:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglprivate-win32.h:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglquery-win32.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglwglext.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglwglext.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglwin32.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglwindow-win32.c:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/win32/gdkglwindow-win32.h:
+ 	Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglconfig-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglconfig-x11.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglcontext-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglcontext-x11.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkgldrawable-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglfont-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglglxext.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglglxext.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkgloverlay-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkgloverlay-x11.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglpixmap-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglpixmap-x11.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglprivate-x11.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglquery-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglwindow-x11.c: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglwindow-x11.h: Removed
+ 	file.
+ 	* mozilla-plugin/lib/gtkglext/gdk/x11/gdkglx.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gen-def-file.sh: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkgl.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkgldebug.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkgldefs.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglext.def: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglinit.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglinit.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglprivate.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglversion.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglversion.h.in: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglwidget.c: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/gtk/gtkglwidget.h: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/m4macros/Makefile.am: Removed file.
+ 	* mozilla-plugin/lib/gtkglext/m4macros/gtkglext.m4: Removed file.
+ 	* mozilla-plugin/src/Makefile.am (SUBDIRS): Removed
+ 	openvrml-player.
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(PluginInstance::SetWindow(NPWindow &)): Changed use of
+ 	OPENVRML_PLAYER environment variable to OPENVRML_GTKPLUG; call
+ 	openvrml-gtkplug instead of openvrml-player.
+ 	* mozilla-plugin/src/openvrml-player/Makefile.am: Removed file.
+ 	* mozilla-plugin/src/openvrml-player/bounded_buffer.h: Removed
+ 	file.
+ 	* mozilla-plugin/src/openvrml-player/command_istream.cpp: Removed
+ 	file.
+ 	* mozilla-plugin/src/openvrml-player/command_istream.h: Removed
+ 	file.
+ 	* mozilla-plugin/src/openvrml-player/flag.cpp: Removed file.
+ 	* mozilla-plugin/src/openvrml-player/flag.h: Removed file.
+ 	* mozilla-plugin/src/openvrml-player/gtkvrmlbrowser.cpp: Removed
+ 	file.
+ 	* mozilla-plugin/src/openvrml-player/gtkvrmlbrowser.h: Removed
+ 	file.
+ 	* mozilla-plugin/src/openvrml-player/player.cpp: Removed file.
+ 	* mozilla-plugin/src/openvrml-player/plugin_streambuf.cpp: Removed
+ 	file.
+ 	* mozilla-plugin/src/openvrml-player/plugin_streambuf.h: Removed
+ 	file.
+ 	* src/Makefile.am (SUBDIRS): Added openvrml-gtkplug.
+ 
  2006-09-27 Braden McDaniel  <br...@en...>
  

Index: bootstrap
===================================================================
RCS file: /cvsroot/openvrml/openvrml/bootstrap,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bootstrap	29 Mar 2006 08:11:53 -0000	1.1
--- bootstrap	1 Oct 2006 05:46:54 -0000	1.2
***************
*** 1 ****
--- 1,3 ----
+ #!/bin/sh
+ ( cd lib/gtkglext && gtkdocize )
  autoreconf --install --symlink

Index: configure-gcc-dbg
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure-gcc-dbg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure-gcc-dbg	29 Mar 2006 08:11:53 -0000	1.1
--- configure-gcc-dbg	1 Oct 2006 05:46:54 -0000	1.2
***************
*** 1,3 ****
  #!/bin/bash
  
! ./$(dirname $0)/configure -C --disable-static CXXFLAGS='-g -O0 -Wall -Wextra -Wno-missing-braces' $*
--- 1,3 ----
  #!/bin/bash
  
! ./$(dirname $0)/configure -C --disable-static --enable-gtk-doc CXXFLAGS='-g -O0 -Wall -Wextra -Wno-missing-braces' $*

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** configure.ac	22 Sep 2006 01:06:06 -0000	1.93
--- configure.ac	1 Oct 2006 05:46:54 -0000	1.94
***************
*** 20,23 ****
--- 20,24 ----
                  [src/libopenvrml-gl/Makefile]
                  [src/libopenvrml-gl/openvrml-gl-config.h]
+                 [src/openvrml-gtkplug/Makefile]
                  [examples/Makefile]
                  [tests/Makefile]
***************
*** 106,110 ****
  
  PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS], , [have_js=no])
! 
  AX_CHECK_GLU
  
--- 107,112 ----
  
  PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS], , [have_js=no])
! PKG_CHECK_MODULES([GTK], [gtk+-2.0], , [have_gtk=no])
! AC_PATH_XTRA
  AX_CHECK_GLU
  
***************
*** 272,275 ****
--- 274,294 ----
  
  #
+ # build the GtkPlug
+ #
+ AC_ARG_ENABLE([gtkplug],
+               [AC_HELP_STRING([--disable-gtkplug],
+                               [do not build the GtkPlug application])])
+ if test X$enable_gtkplug != Xno; then
+   if test X$have_gtk = Xno; then
+     AC_MSG_FAILURE([GTK+ is required to build the GtkPlug])
+   fi
+   if test X$enable_gl_renderer = Xno; then
+     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GL renderer])
+   fi
+ fi
+ AM_CONDITIONAL([ENABLE_GTKPLUG],
+                [test X$enable_gtkplug != Xno -a X$have_gtk != Xno])
+ 
+ #
  # build Mozilla plug-in
  #
***************
*** 278,283 ****
                                [do not build the Mozilla plug-in])])
  if test X$enable_mozilla_plugin != Xno; then
!   if test X$enable_gl_renderer = Xno; then
!     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GL renderer])
    fi
  fi
--- 297,302 ----
                                [do not build the Mozilla plug-in])])
  if test X$enable_mozilla_plugin != Xno; then
!   if test X$enable_gtkplug = Xno; then
!     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GtkPlug application])
    fi
  fi
***************
*** 316,320 ****
  AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])
  AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])
! AC_CONFIG_SUBDIRS([mozilla-plugin])
  
  AC_CONFIG_TESTDIR([tests])
--- 335,339 ----
  AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])
  AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])
! AC_CONFIG_SUBDIRS([lib/gtkglext mozilla-plugin])
  
  AC_CONFIG_TESTDIR([tests])

Index: configure-gcc-opt
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure-gcc-opt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure-gcc-opt	29 Mar 2006 08:11:53 -0000	1.1
--- configure-gcc-opt	1 Oct 2006 05:46:54 -0000	1.2
***************
*** 1,3 ****
  #!/bin/bash
  
! ./$(dirname $0)/configure -C --disable-static --disable-exception-specs CXXFLAGS='-Os -Wall -Wextra -Wno-missing-braces -fvisibility=hidden' $*
--- 1,3 ----
  #!/bin/bash
  
! ./$(dirname $0)/configure -C --disable-static --disable-exception-specs --enable-gtk-doc CXXFLAGS='-Os -Wall -Wextra -Wno-missing-braces -fvisibility=hidden' $*

Index: README
===================================================================
RCS file: /cvsroot/openvrml/openvrml/README,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** README	12 Aug 2006 05:14:58 -0000	1.65
--- README	1 Oct 2006 05:46:54 -0000	1.66
***************
*** 257,265 ****
  based browser will show a listing of successfully installed plug-ins.
  
!    It is possible, for testing or other convenience, to run the plug-in
! from the build directories.  A symbolic link to the plug-in module
! "openvrml.so" must be made in the Mozilla plug-in directory and the
! environment variable "OPENVRML_PLAYER" must be set to the full path name
! of the "openvrml-player" executable.
  
  
--- 257,265 ----
  based browser will show a listing of successfully installed plug-ins.
  
!    It is possible, for testing or other convenience, to run the
! plug-in from the build directories.  A symbolic link to the plug-in
! module "openvrml.so" must be made in the Mozilla plug-in directory and
! the environment variable "OPENVRML_GTKPLUG" must be set to the full
! path name of the "openvrml-gtkplug" executable.
  
  

[openvrml-commit] openvrml/lib/gtkglext/m4macros .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/m4macros
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext/m4macros

Modified Files:
	Makefile.am 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/m4macros/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:11 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:56 -0000	1.2
***************
*** 11,17 ****
  
  m4datadir = $(datadir)/aclocal
! m4data_DATA = gtkglext-$(API_VER).m4
! 
! $(m4data_DATA): $(top_builddir)/config.status
  
  DISTCLEANFILES = gtkglext-$(API_VER).m4
--- 11,15 ----
  
  m4datadir = $(datadir)/aclocal
! noinst_DATA = gtkglext-$(API_VER).m4
  
  DISTCLEANFILES = gtkglext-$(API_VER).m4

[openvrml-commit] openvrml/mozilla-plugin Makefile.am, 1.2, 1.3 configure.ac, 1.14, 1.15

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin

Modified Files:
	Makefile.am configure.ac 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/configure.ac,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure.ac	12 Aug 2006 05:14:58 -0000	1.14
--- configure.ac	1 Oct 2006 05:46:56 -0000	1.15
***************
*** 3,11 ****
          [ope...@li...])
  AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel])
- AC_CONFIG_SUBDIRS([lib/gtkglext])
  AC_CONFIG_FILES([Makefile]
!                 [lib/Makefile]
!                 [src/Makefile]
!                 [src/openvrml-player/Makefile])
  AM_INIT_AUTOMAKE([1.7 foreign])
  
--- 3,8 ----
          [ope...@li...])
  AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel])
  AC_CONFIG_FILES([Makefile]
!                 [src/Makefile])
  AM_INIT_AUTOMAKE([1.7 foreign])
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	25 Dec 2004 07:49:44 -0000	1.2
--- Makefile.am	1 Oct 2006 05:46:56 -0000	1.3
***************
*** 1,3 ****
! SUBDIRS = lib src
  
  ACLOCAL_AMFLAGS = -I ../m4
--- 1,3 ----
! SUBDIRS = src
  
  ACLOCAL_AMFLAGS = -I ../m4

[openvrml-commit] openvrml/lib/gtkglext .cvsignore, 1.1, 1.2 Makefile.am, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib/gtkglext

Modified Files:
	Makefile.am configure.in 
Added Files:
	.cvsignore 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile.in
autom4te.cache
config.h.in

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Sep 2006 00:16:05 -0000	1.1.1.1
--- Makefile.am	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 2,5 ****
--- 2,7 ----
  ## Makefile.am for gtkglext
  
+ ACLOCAL_AMFLAGS = -I m4macros
+ 
  SUBDIRS = gdk gtk m4macros docs
  DIST_SUBDIRS = $(SUBDIRS) examples
***************
*** 13,17 ****
  	gtkglext-uninstalled.pc.in	\
  	gtkglext.spec.in		\
- 	gtkglext.spec			\
  	gtkglext.nsi.in			\
  	gtkglext.nsi			\
--- 15,18 ----
***************
*** 47,56 ****
  
  pkgconfigdir = $(libdir)/pkgconfig
! pkgconfig_DATA = \
  	gdkglext-$(GDK_TARGET)-$(API_VER).pc	\
  	gdkglext-$(API_VER).pc			\
  	gtkglext-$(GDK_TARGET)-$(API_VER).pc	\
  	gtkglext-$(API_VER).pc
! $(pkgconfig_DATA): $(top_builddir)/config.status
  
  DISTCLEANFILES = \
--- 48,57 ----
  
  pkgconfigdir = $(libdir)/pkgconfig
! noinst_DATA = \
  	gdkglext-$(GDK_TARGET)-$(API_VER).pc	\
  	gdkglext-$(API_VER).pc			\
  	gtkglext-$(GDK_TARGET)-$(API_VER).pc	\
  	gtkglext-$(API_VER).pc
! $(noinst_DATA): $(top_builddir)/config.status
  
  DISTCLEANFILES = \

Index: configure.in
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure.in	27 Sep 2006 00:16:06 -0000	1.1.1.1
--- configure.in	1 Oct 2006 05:46:55 -0000	1.2
***************
*** 92,98 ****
  AM_CONFIG_HEADER([config.h])
  
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE
- 
  AC_CANONICAL_HOST
  
--- 92,95 ----
***************
*** 139,142 ****
--- 136,140 ----
  AC_ISC_POSIX
  #AM_DISABLE_STATIC
+ AM_DISABLE_SHARED
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
***************
*** 337,343 ****
  AC_SUBST([REBUILD])
  
- # Honor aclocal flags
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS -I $srcdir/m4macros"
- 
  ## Initial sanity check, done here so that users get told they 
  ## have the wrong dependencies as early in the process as possible.
--- 335,338 ----
***************
*** 355,364 ****
  
  # Check for GLib
! AM_PATH_GLIB_2_0([glib_required_version], ,
!                  [AC_MSG_ERROR([GLib 2.0 not found])])
  
  # Check for GTK+
! AM_PATH_GTK_2_0([gtk_required_version], ,
!                 [AC_MSG_ERROR([GTK+ 2.0 not found])])
  
  # Checks for libraries.
--- 350,357 ----
  
  # Check for GLib
! AM_PATH_GLIB_2_0([glib_required_version], , )
  
  # Check for GTK+
! AM_PATH_GTK_2_0([gtk_required_version], , )
  
  # Checks for libraries.
***************
*** 448,455 ****
    AC_PATH_XTRA
  
-   if test "x$no_x" = "xyes" ; then
-     AC_MSG_ERROR([X development libraries not found])
-   fi
- 
    save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
--- 441,444 ----
***************
*** 540,549 ****
  
  if test "x$gdktarget" = "xx11"; then
!   AC_CHECK_HEADERS([GL/glx.h], ,
!                    [AC_MSG_ERROR([Cannot find GLX header])])
  fi
  
! AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
!                  [AC_MSG_ERROR([Cannot find OpenGL headers])])
  
  if test "x$gdktarget" = "xx11"; then
--- 529,536 ----
  
  if test "x$gdktarget" = "xx11"; then
!   AC_CHECK_HEADERS([GL/glx.h], , )
  fi
  
! AC_CHECK_HEADERS([GL/gl.h GL/glu.h], , )
  
  if test "x$gdktarget" = "xx11"; then
***************
*** 605,613 ****
    fi
  
-   if test "x$have_GL" = "xno" ; then
-     # no GL found
-     AC_MSG_ERROR([Cannot find GL library])
-   fi
- 
    # GLU
  
--- 592,595 ----
***************
*** 651,659 ****
    fi
  
-   if test "x$have_GLU" = "xno" ; then
-     # no GLU found
-     AC_MSG_ERROR([Cannot find GLU library])
-   fi
- 
    # Checks for SGI's GLU library
    if test "x$have_SGI_GLU" = "xno" ; then
--- 633,636 ----
***************
*** 733,739 ****
                 have_opengl32=yes])
    AC_MSG_RESULT([$have_opengl32])
-   if test "x$have_opengl32" = "xno" ; then
-     AC_MSG_ERROR([Cannot find GL library])
-   fi
  
    AC_MSG_CHECKING([for gluNewQuadric in -lglu32])
--- 710,713 ----
***************
*** 747,753 ****
                 have_glu32=yes])
    AC_MSG_RESULT([$have_glu32])
-   if test "x$have_glu32" = "xno" ; then
-     AC_MSG_ERROR([Cannot find GLU library])
-   fi
  
  dnl   AC_CHECK_LIB(opengl32, glNewList,
--- 721,724 ----
***************
*** 830,886 ****
  ##################################################
  
! AC_ARG_WITH([html-dir],
!             [AC_HELP_STRING([--with-html-dir=PATH],
!                             [path to installed docs])])
! 
! if test "x$with_html_dir" = "x" ; then
!   HTML_DIR='${datadir}/gtk-doc/html'
! else
!   HTML_DIR=$with_html_dir
! fi
! 
! AC_SUBST([HTML_DIR])
! 
! dnl Make people enable the gtk-doc stuff explicitely.
! AC_ARG_ENABLE([gtk-doc],
!               [AC_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
! 
!   gtk_doc_min_version=0.10
! 
!   AC_CHECK_PROG([GTKDOC], [gtkdoc-mkdb], [true], [false])
! 
!   if $GTKDOC ; then
!     gtk_doc_version=`gtkdoc-mkdb --version`
!     AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
! 
!     IFS="${IFS= 	}"; gtk_save_IFS="$IFS"; IFS="."
!     set $gtk_doc_version
!     for min in $gtk_doc_min_version ; do
!         cur=$1; shift
!         if test -z $min ; then break; fi
!         if test -z $cur ; then GTKDOC=false; break; fi
!         if test $cur -gt $min ; then break ; fi
!         if test $cur -lt $min ; then GTKDOC=false; break ; fi
!     done
!     IFS="$gtk_save_IFS"
! 
!     if $GTKDOC ; then
!       AC_MSG_RESULT([yes])
!     else
!       AC_MSG_RESULT([no])
!     fi
!   fi
! 
!   if test x$GTKDOC != xtrue ; then
!     enable_gtk_doc=no 
!   fi
! 
! fi
! 
! AM_CONDITIONAL([ENABLE_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"])
  
  
--- 801,805 ----
  ##################################################
  
! GTK_DOC_CHECK
  
  

[openvrml-commit] openvrml/lib Makefile.am,1.4,1.5

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/lib

Modified Files:
	Makefile.am 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	29 Oct 2004 15:59:07 -0000	1.4
--- Makefile.am	1 Oct 2006 05:46:54 -0000	1.5
***************
*** 1 ****
! SUBDIRS = antlr
--- 1 ----
! SUBDIRS = antlr gtkglext

[openvrml-commit] openvrml/src/openvrml-gtkplug .cvsignore, 1.1, 1.2 Makefile.am, 1.1, 1.2 bounded_buffer.h, 1.1, 1.2 command_istream.cpp, 1.1, 1.2 command_istream.h, 1.1, 1.2 flag.cpp, 1.1, 1.2 flag.h, 1.1, 1.2 gtkvrmlbrowser.cpp, 1.1, 1.2 gtkvrmlbrowser.h, 1.1, 1.2 main.cpp, 1.1, 1.2 plugin_streambuf.cpp, 1.1, 1.2 plugin_streambuf.h, 1.1, 1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/src/openvrml-gtkplug

Added Files:
	.cvsignore Makefile.am bounded_buffer.h command_istream.cpp 
	command_istream.h flag.cpp flag.h gtkvrmlbrowser.cpp 
	gtkvrmlbrowser.h main.cpp plugin_streambuf.cpp 
	plugin_streambuf.h 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
openvrml-player

--- NEW FILE: main.cpp ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# include <iostream>
# include <sstream>
# include <boost/lexical_cast.hpp>
# include <boost/thread/thread.hpp>
# include <unistd.h>
// Must include before X11 headers.
# include <boost/numeric/conversion/converter.hpp>
# include <gtk/gtk.h>
# include <openvrml/browser.h>

# include "gtkvrmlbrowser.h"
# include "command_istream.h"
# include "plugin_streambuf.h"
# include "flag.h"

using namespace openvrml_player;

namespace {

    const char application_name[] = "OpenVRML GtkPlug";

    //
    // We don't already know what the URI of the initial stream is until we
    // start getting that data from the browser.  This is a placeholder that
    // is used to identify the plugin_streambuf that will be used to receive
    // the initial stream data.
    //
    const char initial_stream_uri[] = "x-openvrml-initial:";

    //
    // Used to signal the various threads that we're done.  "quit" is
    // initiated when the command_istream gets EOF.  At that point, the
    // command_istream_reader thread sets quit_flag to true.  This flag is
    // checked by the command_channel_loop thread and the main (rendering)
    // thread, signaling them to terminate.
    //
    flag quit_flag;
}

namespace openvrml_player {

    struct command_istream_reader {
        explicit command_istream_reader(command_istream & in):
            in_(&in)
        {}

        void operator()() const throw ()
        {
            using std::string;

            string command_line;
            while (getline(*this->in_, command_line)) {
                using std::istringstream;

                istringstream command_line_stream(command_line);
                string command;
                command_line_stream >> command;
                if (command == "get-url-result") {
                    using boost::shared_ptr;

                    std::string url;
                    int result;
                    command_line_stream >> url >> result;

                    shared_ptr<plugin_streambuf> streambuf =
                        uninitialized_plugin_streambuf_map_.find(url);
                    assert(streambuf);
                    streambuf->set_get_url_result(result);
                } else if (command == "new-stream") {
                    using boost::shared_ptr;

                    size_t stream_id;
                    std::string type, url;
                    command_line_stream >> stream_id >> type >> url;

                    shared_ptr<plugin_streambuf> streambuf =
                        uninitialized_plugin_streambuf_map_.find(url);

                    static bool got_initial_stream = false;
                    if (!streambuf) {
                        if (!got_initial_stream) {
                            g_assert(uninitialized_plugin_streambuf_map_.size()
                                     == 1);
                            streambuf =
                                uninitialized_plugin_streambuf_map_.front();
                            got_initial_stream = true;
                        } else {
                            g_warning("Attempt to create an unrequested "
                                      "stream.");
                            continue;
                        }
                    }
                    streambuf->init(stream_id, url, type);
                } else if (command == "destroy-stream") {
                    size_t stream_id;
                    command_line_stream >> stream_id;
                    plugin_streambuf_map_t::iterator pos = 
                        plugin_streambuf_map.find(stream_id);
                    if (pos == plugin_streambuf_map.end()) {
                        g_warning("Attempt to destroy a nonexistent stream.");
                        continue;
                    }
                    pos->second->buf_.set_eof();
                    plugin_streambuf_map.erase(pos);
                } else if (command == "write") {
                    size_t stream_id, offset, length;
                    command_line_stream >> stream_id >> offset >> length;
                    plugin_streambuf_map_t::const_iterator pos =
                        plugin_streambuf_map.find(stream_id);
                    if (pos == plugin_streambuf_map.end()) {
                        g_warning("Attempt to write to a nonexistent stream.");
                        continue;
                    }
                    for (size_t i = 0; i < length; ++i) {
                        pos->second->buf_.put(this->in_->get());
                    }
                }
            }

            //
            // Got EOF from the command stream. Time to shut down.
            //
            ::quit_flag.value(true);

            //
            // We can safely shut down the Gtk main loop from here.
            //
            // (However, trying to shut down the command_main loop results in
            // it deadlocking in g_main_context_check's call to poll. So we
            // still use the annoying quit_flag condition variable (see above)
            // to end that thread).
            //
            gtk_main_quit();
        }

    private:
        command_istream * in_;
    };
}

extern "C" gboolean
openvrml_player_command_channel_loop_quit_event(gpointer data);

namespace {

    gchar ** args;

    GOptionEntry options[] = {
        {
            G_OPTION_REMAINING,
            '\0',
            0,
            G_OPTION_ARG_STRING_ARRAY,
            &args,
            "a GtkSocket id",
            "GTK-SOCKET-ID"
        },
        { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 }
    };

    struct initial_stream_reader {
        initial_stream_reader(
            const boost::shared_ptr<plugin_streambuf> & streambuf,
            GtkVrmlBrowser & vrml_browser):
            streambuf_(streambuf),
            vrml_browser_(&vrml_browser)
        {}

        void operator()() const throw ()
        {
            class plugin_istream : public openvrml::resource_istream {
                boost::shared_ptr<plugin_streambuf> streambuf_;

            public:
                explicit plugin_istream(
                    const boost::shared_ptr<plugin_streambuf> & streambuf):
                    openvrml::resource_istream(streambuf.get()),
                    streambuf_(streambuf)
                {}

                virtual ~plugin_istream() throw ()
                {}

            private:
                virtual const std::string do_url() const throw (std::bad_alloc)
                {
                    return this->streambuf_->url();
                }

                virtual const std::string do_type() const
                    throw (std::bad_alloc)
                {
                    return this->streambuf_->type();
                }

                virtual bool do_data_available() const throw ()
                {
                    return this->streambuf_->data_available();
                }
            } in(this->streambuf_);
            gtk_vrml_browser_set_world(this->vrml_browser_, in);
        }

    private:
        boost::shared_ptr<plugin_streambuf> streambuf_;
        GtkVrmlBrowser * vrml_browser_;
    };

    GIOChannel * request_channel;

    struct command_channel_loop {
        explicit command_channel_loop(GMainLoop & main_loop):
            main_loop_(&main_loop)
        {}

        void operator()() const throw ()
        {
            GSource * const quit = g_idle_source_new();
            const GDestroyNotify notify = 0;
            g_source_set_callback(
                quit,
                ::openvrml_player_command_channel_loop_quit_event,
                this->main_loop_,
                notify);
            guint source_id =
                g_source_attach(quit,
                                g_main_loop_get_context(this->main_loop_));
            g_return_if_fail(source_id != 0);

            g_main_loop_run(this->main_loop_);
        }

    private:
        GMainLoop * main_loop_;
    };
}

int main(int argc, char * argv[])
{
    using std::cerr;
    using std::endl;
    using std::vector;
    using boost::function0;
    using boost::shared_ptr;
    using boost::thread;
    using boost::thread_group;

    using namespace openvrml_player;

    g_set_application_name(application_name);

    gtk_init(&argc, &argv);
    gtk_gl_init(&argc, &argv);

    GError * error = 0;

    GOptionContext * const context =
        g_option_context_new("- render VRML worlds");
    const gchar * const translation_domain = 0;
    g_option_context_add_main_entries(context, options, translation_domain);
    g_option_context_add_group(context, gtk_get_option_group(true));
    gboolean succeeded = g_option_context_parse(context, &argc, &argv, &error);
    if (!succeeded) {
        if (error) {
            g_critical(error->message);
            g_error_free(error);
        }
        return EXIT_FAILURE;        
    }

    if (!args) {
        cerr << argv[0] << ": missing required GTK-SOCKET-ID argument" << endl;
        return EXIT_FAILURE;
    }

    GdkNativeWindow socket_id;
    try {
        socket_id = boost::lexical_cast<GdkNativeWindow>(args[0]);
    } catch (const boost::bad_lexical_cast & ex) {
        cerr << argv[0] << ": expected integer value for GTK-SOCKET-ID "
            "argument" << endl;
        return EXIT_FAILURE;
    }

    command_istream command_in;

    ::request_channel = g_io_channel_unix_new(1); // stdout

    GtkWidget * const window =  gtk_plug_new(socket_id);

    GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel);
    gtk_container_add(GTK_CONTAINER(window), vrml_browser);    

    gtk_widget_show_all(window);

    thread_group threads;

    GMainContext * command_main_context = 0;
    GMainLoop * command_main = 0;
    GIOChannel * command_channel = 0;
    GSource * command_watch = 0;

    command_main_context = g_main_context_new();
    command_main = g_main_loop_new(command_main_context, false);
    command_channel = g_io_channel_unix_new(0); // stdin
    error = 0;
    GIOStatus status = g_io_channel_set_encoding(command_channel,
                                                 0, // binary (no encoding)
                                                 &error);
    if (status != G_IO_STATUS_NORMAL) {
        if (error) {
            g_critical(error->message);
            g_error_free(error);
        }
        return EXIT_FAILURE;
    }

    command_watch = g_io_create_watch(command_channel,
                                      GIOCondition(G_IO_IN | G_IO_HUP));
    const GDestroyNotify notify = 0;
    g_source_set_callback(
        command_watch,
        reinterpret_cast<GSourceFunc>(::command_data_available),
        static_cast<command_streambuf *>(command_in.rdbuf()), notify);
    guint source_id = g_source_attach(command_watch,
                                      command_main_context);
    g_return_val_if_fail(source_id != 0, EXIT_FAILURE);

    function0<void> command_channel_loop_func =
        command_channel_loop(*command_main);
    threads.create_thread(command_channel_loop_func);
        
    shared_ptr<plugin_streambuf> initial_stream(
        new plugin_streambuf(initial_stream_uri));
    uninitialized_plugin_streambuf_map_.insert(initial_stream_uri,
                                               initial_stream);
    function0<void> initial_stream_reader_func =
        initial_stream_reader(initial_stream,
                              *GTK_VRML_BROWSER(vrml_browser));
    threads.create_thread(initial_stream_reader_func);

    function0<void> read_commands = command_istream_reader(command_in);
    threads.create_thread(read_commands);

    gtk_main();

    threads.join_all();

    g_source_unref(command_watch);

    status = g_io_channel_shutdown(command_channel, true, &error);
    if (status != G_IO_STATUS_NORMAL) {
        if (error) {
            g_critical(error->message);
            g_error_free(error);
        }
    }
    g_io_channel_unref(command_channel);

    g_main_loop_unref(command_main);
    g_main_context_unref(command_main_context);

    if (::request_channel) {
        GError * error = 0;
        const gboolean flush = false;
        GIOStatus status = g_io_channel_shutdown(::request_channel,
                                                 flush,
                                                 &error);
        if (status != G_IO_STATUS_NORMAL) {
            if (error) {
                g_critical(error->message);
                g_error_free(error);
            }
        }
    }
    g_io_channel_unref(::request_channel);
}

gboolean openvrml_player_command_channel_loop_quit_event(const gpointer data)
{
    GMainLoop * const main_loop = static_cast<GMainLoop *>(data);

    if (::quit_flag.value()) {
        g_main_loop_quit(main_loop);
        return false;
    }
    return true;
}

--- NEW FILE: gtkvrmlbrowser.cpp ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# include <iostream>
# include <sstream>
// Must include before X11 headers.
# include <boost/numeric/conversion/converter.hpp>
# include <X11/keysym.h>
# include <gdk/gdkx.h>
# include <openvrml/browser.h>
# include <openvrml/gl/viewer.h>
# include "gtkvrmlbrowser.h"
# include "plugin_streambuf.h"

extern "C" {
    void gtk_vrml_browser_class_init(GtkVrmlBrowserClass * klass);
    void gtk_vrml_browser_init(GtkVrmlBrowser * vrml_browser);

    G_GNUC_INTERNAL gboolean gtk_vrml_browser_destroy(GtkWidget * widget,
                                                      GdkEvent * event,
                                                      gpointer data);
    G_GNUC_INTERNAL gboolean gtk_vrml_browser_realize(GtkWidget * widget,
                                                      GdkEvent * event,
                                                      gpointer data);
    G_GNUC_INTERNAL gboolean
    gtk_vrml_browser_expose_event(GtkWidget * widget,
                                  GdkEventExpose * event,
                                  gpointer data);
    G_GNUC_INTERNAL gboolean
    gtk_vrml_browser_configure_event(GtkWidget * widget,
                                     GdkEventConfigure * event,
                                     gpointer data);
    G_GNUC_INTERNAL gboolean
    gtk_vrml_browser_key_press_event(GtkWidget * widget,
                                     GdkEventKey * event,
                                     gpointer data);
    G_GNUC_INTERNAL gboolean
    gtk_vrml_browser_button_press_event(GtkWidget * widget,
                                        GdkEventButton * event,
                                        gpointer data);
    G_GNUC_INTERNAL gboolean
    gtk_vrml_browser_button_release_event(GtkWidget * widget,
                                          GdkEventButton * event,
                                          gpointer data);
    G_GNUC_INTERNAL gboolean
    gtk_vrml_browser_motion_notify_event(GtkWidget * widget,
                                         GdkEventMotion * event,
                                         gpointer data);

    G_GNUC_INTERNAL gint gtk_vrml_browser_timeout_callback(gpointer ptr);
}

GType gtk_vrml_browser_get_type()
{
    static GType type = 0;

    if (!type) {
        static const GTypeInfo info = {
            sizeof (GtkVrmlBrowserClass),
            0, // base_init
            0, // base_finalize
            reinterpret_cast<GClassInitFunc>(gtk_vrml_browser_class_init),
            0, // class_finalize
            0, // class_data
            sizeof (GtkVrmlBrowser),
            0, // n_preallocs
            reinterpret_cast<GInstanceInitFunc>(gtk_vrml_browser_init),
            0  // value_table
        };

        type = g_type_register_static(GTK_TYPE_DRAWING_AREA,
                                      "GtkVrmlBrowser",
                                      &info,
                                      GTypeFlags(0));
    }
    return type;
}

namespace {
    G_GNUC_INTERNAL GdkGLConfig * gl_config;

    class G_GNUC_INTERNAL browser : public openvrml::browser {
        GIOChannel * request_channel_;

    public:
        explicit browser(GIOChannel & request_channel);

    private:
        virtual std::auto_ptr<openvrml::resource_istream>
        do_get_resource(const std::string & uri);
    };

    class G_GNUC_INTERNAL GtkGLViewer : public openvrml::gl::viewer {
        friend void
        (::gtk_vrml_browser_load_url)(GtkVrmlBrowser * vrml_browser,
                                      const gchar ** url,
                                      const gchar ** parameter);
        friend void
        (::gtk_vrml_browser_set_world)(GtkVrmlBrowser * vrml_browser,
                                       openvrml::resource_istream & in);
        friend gint (::gtk_vrml_browser_timeout_callback)(gpointer ptr);
        friend gboolean (::gtk_vrml_browser_expose_event)(GtkWidget *,
                                                          GdkEventExpose *,
                                                          gpointer);

        ::browser browser_;
        GtkVrmlBrowser & vrml_browser_;
        guint timer;

    public:
        bool redrawNeeded;

        GtkGLViewer(GIOChannel & request_channel,
                    GtkVrmlBrowser & vrml_browser);
        virtual ~GtkGLViewer() throw ();

        void timer_update();

    protected:
        //
        // Implement pure virtual methods from openvrml::gl::viewer.
        //
        virtual void post_redraw();
        virtual void set_cursor(openvrml::gl::viewer::cursor_style);
        virtual void swap_buffers();
        virtual void set_timer(double);
    };
}

GtkWidget * gtk_vrml_browser_new(GIOChannel * const request_channel)
{
    GtkVrmlBrowser * const vrml_browser =
        GTK_VRML_BROWSER(g_object_new(GTK_TYPE_VRML_BROWSER, 0));
    try {
        vrml_browser->viewer = new GtkGLViewer(*request_channel,
                                               *vrml_browser);
    } catch (std::bad_alloc &) {
        g_return_val_if_reached(0);
    }
    static_cast<GtkGLViewer *>(vrml_browser->viewer)
        ->resize(GTK_WIDGET(vrml_browser)->allocation.width,
                 GTK_WIDGET(vrml_browser)->allocation.height);

    return GTK_WIDGET(vrml_browser);
}

void gtk_vrml_browser_load_url(GtkVrmlBrowser * const vrml_browser,
                               const gchar ** url,
                               const gchar ** parameter)
{
    using std::string;
    using std::vector;

    GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(vrml_browser->viewer);
    vector<string> url_vec, param_vec;
    while (url && *url) { url_vec.push_back(*(url++)); }
    while (parameter && *parameter) { param_vec.push_back(*(parameter++)); }
    viewer.browser_.load_url(url_vec, param_vec);
}

void gtk_vrml_browser_set_world(GtkVrmlBrowser * vrml_browser,
                                openvrml::resource_istream & in)
{
    GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(vrml_browser->viewer);
    viewer.browser_.set_world(in);
}

void gtk_vrml_browser_class_init(GtkVrmlBrowserClass *)
{}

void gtk_vrml_browser_init(GtkVrmlBrowser * const vrml_browser)
{
    vrml_browser->viewer = 0;

    if (!::gl_config) {
        static const int attrib_list[] = {
            // GDK_GL_ALPHA_SIZE, 1,
            GDK_GL_DOUBLEBUFFER,
            GDK_GL_DEPTH_SIZE, 1,
            GDK_GL_RGBA,
            GDK_GL_RED_SIZE, 1,
            GDK_GL_ATTRIB_LIST_NONE
        };
        ::gl_config = gdk_gl_config_new(attrib_list);
    }

    static GdkGLContext * const share_list = 0;
    static const gboolean direct = false;
    static const int render_type = GDK_GL_RGBA_TYPE;
    gtk_widget_set_gl_capability(GTK_WIDGET(vrml_browser),
                                 ::gl_config,
                                 share_list,
                                 direct,
                                 render_type);

    gtk_widget_add_events(GTK_WIDGET(vrml_browser),
                          GDK_EXPOSURE_MASK
                          | GDK_BUTTON_PRESS_MASK
                          | GDK_BUTTON_RELEASE_MASK
                          | GDK_KEY_PRESS_MASK
                          | GDK_POINTER_MOTION_MASK);

    g_signal_connect(G_OBJECT(vrml_browser),
                     "destroy_event",
                     G_CALLBACK(gtk_vrml_browser_destroy),
                     0);
    g_signal_connect(G_OBJECT(vrml_browser),
                     "expose_event",
                     G_CALLBACK(gtk_vrml_browser_expose_event),
                     0);
    g_signal_connect(G_OBJECT(vrml_browser),
                     "configure_event",
                     G_CALLBACK(gtk_vrml_browser_configure_event),
                     0);
    g_signal_connect(G_OBJECT(vrml_browser),
                     "key_press_event",
                     G_CALLBACK(gtk_vrml_browser_key_press_event),
                     0);
    g_signal_connect(G_OBJECT(vrml_browser),
                     "button_press_event",
                     G_CALLBACK(gtk_vrml_browser_button_press_event),
                     0);
    g_signal_connect(G_OBJECT(vrml_browser),
                     "button_release_event",
                     G_CALLBACK(gtk_vrml_browser_button_release_event),
                     0);
    g_signal_connect(G_OBJECT(vrml_browser),
                     "motion_notify_event",
                     G_CALLBACK(gtk_vrml_browser_motion_notify_event),
                     0);
}

gboolean gtk_vrml_browser_destroy(GtkWidget * const widget,
                                  GdkEvent *,
                                  gpointer)
{
    delete static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
    return true;
}

gboolean gtk_vrml_browser_realize(GtkWidget *, GdkEvent *, gpointer)
{
    return true;
}

gboolean gtk_vrml_browser_expose_event(GtkWidget * const widget,
                                       GdkEventExpose * const event,
                                       gpointer)
{
    GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
    g_assert(gl_drawable);
    GdkGLContext * const gl_context = gtk_widget_get_gl_context(widget);
    g_assert(gl_context);
    GtkGLViewer & viewer =
        *static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
    if (event->count == 0
        && gdk_gl_drawable_make_current(gl_drawable, gl_context)) {
        viewer.redraw();
    }
    viewer.redrawNeeded = false;
    if (viewer.timer == 0) { viewer.timer_update(); }
    return true;
}

gboolean gtk_vrml_browser_configure_event(GtkWidget * const widget,
                                          GdkEventConfigure *,
                                          gpointer)
{
    GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
    g_assert(gl_drawable);
    GdkGLContext * const gl_context = gtk_widget_get_gl_context(widget);
    g_assert(gl_context);
    if (GTK_VRML_BROWSER(widget)->viewer
        && gdk_gl_drawable_make_current(gl_drawable, gl_context)) {
        GtkGLViewer & viewer =
            *static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
        viewer.resize(widget->allocation.width, widget->allocation.height);
    }
    return true;
}

gboolean gtk_vrml_browser_key_press_event(GtkWidget * const widget,
                                          GdkEventKey * const event,
                                          gpointer)
{
    using openvrml::gl::viewer;

    viewer::event_info info;
    info.event = viewer::event_key_down;

    switch (event->keyval) {
    case XK_Home:
        info.what = viewer::key_home;
        break;

    case XK_Left:
        info.what = viewer::key_left;
        break;

    case XK_Up:
        info.what = viewer::key_up;
        break;

    case XK_Right:
        info.what = viewer::key_right;
        break;

    case XK_Down:
        info.what = viewer::key_down;
        break;

    case XK_Page_Up:
        info.what = viewer::key_page_up;
        break;

    case XK_Page_Down:
        info.what = viewer::key_page_down;
        break;

    default:
        if (event->length <= 0) { return true; }
        info.what = event->string[0];
    }
    GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
    g_assert(gl_drawable);
    GdkGLContext * const gl_context = gtk_widget_get_gl_context(widget);
    g_assert(gl_context);
    if (gdk_gl_drawable_make_current(gl_drawable, gl_context)) {
        GtkGLViewer * const viewer =
            static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
        g_assert(viewer);
        viewer->input(&info);
    }
    return true;
}

gboolean gtk_vrml_browser_button_press_event(GtkWidget * const widget,
                                             GdkEventButton * const event,
                                             gpointer)
{
    using openvrml::gl::viewer;

    viewer::event_info info;
    info.event = viewer::event_mouse_click;

    switch (event->button) {
    case Button1:
        info.what = 0;
        break;

    case Button2:
        info.what = 1;
        break;

    case Button3:
        info.what = 2;
        break;
    }

    info.x = int(event->x);
    info.y = int(event->y);
    GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
    g_assert(gl_drawable);
    GdkGLContext * const gl_context = gtk_widget_get_gl_context(widget);
    g_assert(gl_context);
    if (gdk_gl_drawable_make_current(gl_drawable, gl_context)) {
        GtkGLViewer * const viewer =
            static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
        g_assert(viewer);
        viewer->input(&info);
    }
    return true;
}

gboolean gtk_vrml_browser_button_release_event(GtkWidget * const widget,
                                               GdkEventButton * const event,
                                               gpointer)
{
    using openvrml::gl::viewer;

    viewer::event_info info;
    info.event = viewer::event_mouse_release;

    switch (event->button) {
    case Button1:
        info.what = 0;
        break;

    case Button2:
        info.what = 1;
        break;

    case Button3:
        info.what = 2;
        break;
    }

    info.x = int(event->x);
    info.y = int(event->y);
    GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
    g_assert(gl_drawable);
    GdkGLContext * const gl_context = gtk_widget_get_gl_context(widget);
    g_assert(gl_context);
    if (gdk_gl_drawable_make_current(gl_drawable, gl_context)) {
        GtkGLViewer * const viewer =
            static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
        g_assert(viewer);
        viewer->input(&info);
    }
    return true;
}

gboolean gtk_vrml_browser_motion_notify_event(GtkWidget * const widget,
                                              GdkEventMotion * const event,
                                              gpointer)
{
    using openvrml::gl::viewer;

    viewer::event_info info;
    info.event = viewer::event_mouse_drag;
    info.what = 0;
    if (event->state & Button1Mask) {
        info.what = 0;
    } else if (event->state & Button2Mask) {
        info.what = 1;
    } else if (event->state & Button3Mask) {
        info.what = 2;
    } else {
        info.event = viewer::event_mouse_move;
    }

    info.x = int(event->x);
    info.y = int(event->y);
    GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
    g_assert(gl_drawable);
    GdkGLContext * const gl_context = gtk_widget_get_gl_context(widget);
    g_assert(gl_context);
    if (gdk_gl_drawable_make_current(gl_drawable, gl_context)) {
        GtkGLViewer * const viewer =
            static_cast<GtkGLViewer *>(GTK_VRML_BROWSER(widget)->viewer);
        g_assert(viewer);
        viewer->input(&info);
    }
    return true;
}

gint gtk_vrml_browser_timeout_callback(const gpointer ptr)
{
    assert(ptr);

    GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr);
    viewer.timer_update();
    return false;
}

namespace {

    browser::browser(GIOChannel & request_channel):
        openvrml::browser(std::cout, std::cerr),
        request_channel_(&request_channel)
    {}

    std::auto_ptr<openvrml::resource_istream>
    browser::do_get_resource(const std::string & uri)
    {
        using openvrml_player::plugin_streambuf;

        class plugin_resource_istream : public openvrml::resource_istream {
            boost::shared_ptr<plugin_streambuf> streambuf_;
            GIOChannel * request_channel_;

        public:
            plugin_resource_istream(const std::string & uri,
                                    GIOChannel * const request_channel):
                openvrml::resource_istream(0),
                streambuf_(new plugin_streambuf(uri)),
                request_channel_(request_channel)
            {
                using std::ostringstream;
                using openvrml_player::uninitialized_plugin_streambuf_map_;

                this->rdbuf(this->streambuf_.get());
                uninitialized_plugin_streambuf_map_.insert(uri,
                                                           this->streambuf_);

                ostringstream request;
                request << "get-url " << uri << '\n';
                gsize bytes_written;
                g_io_channel_write_chars(this->request_channel_,
                                         request.str().data(),
                                         request.str().length(),
                                         &bytes_written,
                                         0);
                g_io_channel_flush(this->request_channel_, 0);

                //
                // This blocks until we know the result of NPN_GetURL.
                //
                const int get_url_result = this->streambuf_->get_url_result();
                if (get_url_result != 0) {
                    this->setstate(std::ios_base::failbit);
                }
            }

        private:
            virtual const std::string do_url() const throw ()
            {
                return this->streambuf_->url();
            }

            virtual const std::string do_type() const throw ()
            {
                return this->streambuf_->type();
            }

            virtual bool do_data_available() const throw ()
            {
                return this->streambuf_->data_available();
            }
        };
        return std::auto_ptr<openvrml::resource_istream>(
            new plugin_resource_istream(uri, this->request_channel_));
    }

    GtkGLViewer::GtkGLViewer(GIOChannel & request_channel,
                             GtkVrmlBrowser & vrml_browser):
        browser_(request_channel),
        vrml_browser_(vrml_browser),
        timer(0),
        redrawNeeded(false)
    {
        this->browser_.viewer(this);
    }

    GtkGLViewer::~GtkGLViewer() throw ()
    {
        if (this->timer) { g_source_remove(timer); }
    }

    void GtkGLViewer::post_redraw()
    {
        if (!this->redrawNeeded) {
            this->redrawNeeded = true;
            gtk_widget_queue_draw(GTK_WIDGET(&this->vrml_browser_));
        }
    }

    void GtkGLViewer::set_cursor(cursor_style style)
    {
        GdkCursor * cursor(0);

        switch(style) {
        case cursor_inherit:
            XDefineCursor(GDK_WINDOW_XDISPLAY(
                              GTK_WIDGET(&this->vrml_browser_)->window),
                          GDK_WINDOW_XWINDOW(
                              GTK_WIDGET(&this->vrml_browser_)->window),
                          None);
            return;

        case cursor_info:
            cursor = gdk_cursor_new(GDK_HAND1);
            break;

        case cursor_cycle:
            cursor = gdk_cursor_new(GDK_EXCHANGE);
            break;

        case cursor_up_down:
            cursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW);
            break;

        case cursor_crosshair:
            cursor = gdk_cursor_new(GDK_CROSSHAIR);
            break;

        default:
            cursor = gdk_cursor_new(GDK_ARROW);
        }

        gdk_window_set_cursor(GTK_WIDGET(&this->vrml_browser_)->window,
                              cursor);
        gdk_cursor_destroy(cursor);
    }

    void GtkGLViewer::swap_buffers()
    {
        GdkGLDrawable * const gl_drawable =
            gtk_widget_get_gl_drawable(GTK_WIDGET(&this->vrml_browser_));
        gdk_gl_drawable_swap_buffers(gl_drawable);
    }

    void GtkGLViewer::set_timer(const double t)
    {
        if (!this->timer) {
            this->timer =
                g_timeout_add(guint(10.0 * (t + 1)),
                              GtkFunction(gtk_vrml_browser_timeout_callback),
                              this);
        }
    }

    void GtkGLViewer::timer_update()
    {
        this->timer = 0;
        this->viewer::update();
    }
}

--- NEW FILE: plugin_streambuf.h ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# ifndef OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
#   define OPENVRML_PLAYER_PLUGIN_STREAMBUF_H

#   include <map>
#   include <set>
#   include <streambuf>
#   include <boost/shared_ptr.hpp>
#   include <boost/enable_shared_from_this.hpp>
#   include "bounded_buffer.h"

namespace openvrml_player {

    class command_istream_reader;

    class plugin_streambuf :
        public boost::enable_shared_from_this<plugin_streambuf>,
        public std::streambuf {

        friend class command_istream_reader;

        mutable boost::mutex mutex_;
        int get_url_result_;
        mutable boost::condition received_get_url_result_;
        bool initialized_;
        mutable boost::condition streambuf_initialized_;
        std::string url_;
        std::string type_;
        bounded_buffer<char_type, 16384> buf_;
        int_type i_;
        char_type c_;

    protected:
        virtual int_type underflow();

    public:
        explicit plugin_streambuf(const std::string & requested_url);
        void set_get_url_result(int result);
        int get_url_result() const;
        void init(size_t stream_id,
                  const std::string & received_url,
                  const std::string & type);
        const std::string & url() const;
        const std::string & type() const;
        bool data_available() const;
    };

    extern class uninitialized_plugin_streambuf_map {
        mutable boost::mutex mutex_;
        typedef std::multimap<std::string, boost::shared_ptr<plugin_streambuf> >
            map_t;
        map_t map_;

    public:
        const boost::shared_ptr<plugin_streambuf>
        find(const std::string & url) const;
        void insert(const std::string & url,
                    const boost::shared_ptr<plugin_streambuf> & streambuf);
        bool erase(const std::string & url);
        size_t size() const;
        const boost::shared_ptr<plugin_streambuf> front() const;
    } uninitialized_plugin_streambuf_map_;


    typedef std::map<size_t, boost::shared_ptr<plugin_streambuf> >
        plugin_streambuf_map_t;

    extern plugin_streambuf_map_t plugin_streambuf_map;
}

# endif // ifndef OPENVRML_PLAYER_PLUGIN_STREAMBUF_H

--- NEW FILE: flag.h ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# ifndef OPENVRML_PLAYER_FLAG_H
#   define OPENVRML_PLAYER_FLAG_H

#   include <boost/thread/mutex.hpp>

namespace openvrml_player {

    class flag : boost::noncopyable {
        mutable boost::mutex mutex_;
        bool value_;

    public:
        flag(bool init = false);

        bool value() const;
        void value(bool val);
    };
}

# endif // ifndef OPENVRML_PLAYER_FLAG_H

--- NEW FILE: command_istream.h ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# ifndef OPENVRML_PLAYER_COMMAND_ISTREAM_H
#   define OPENVRML_PLAYER_COMMAND_ISTREAM_H

#   include <streambuf>
#   include <glib.h>

#   include "bounded_buffer.h"

extern "C" gboolean command_data_available(GIOChannel * source,
                                           GIOCondition condition,
                                           gpointer data);

namespace openvrml_player {

    class command_streambuf : boost::noncopyable, public std::streambuf {
        friend gboolean (::command_data_available)(GIOChannel * source,
                                                   GIOCondition condition,
                                                   gpointer data);

        bounded_buffer<char_type, 16384> source_buffer_;
        char_type c_;

    protected:
        virtual int_type underflow();

    public:
        command_streambuf();
    };


    class command_istream : boost::noncopyable, public std::istream {
        command_streambuf buf_;

    public:
        command_istream();
    };
}

# endif // ifndef OPENVRML_PLAYER_COMMAND_ISTREAM_H

--- NEW FILE: gtkvrmlbrowser.h ---
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; -*-
 *
 * OpenVRML Mozilla plug-in
 * Copyright 2004, 2005, 2006  Braden N. McDaniel
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

# ifndef GTK_VRML_BROWSER_H
#   define GTK_VRML_BROWSER_H

#   include <gtk/gtkdrawingarea.h>
#   include <gtk/gtkgl.h>

G_BEGIN_DECLS

#   define GTK_TYPE_VRML_BROWSER            (gtk_vrml_browser_get_type ())
#   define GTK_VRML_BROWSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VRML_BROWSER, GtkVrmlBrowser))
#   define GTK_VRML_BROWSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VRML_BROWSER, GtkVrmlBrowserClass))
#   define GTK_IS_VRML_BROWSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VRML_BROWSER))
#   define GTK_IS_VRML_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VRML_BROWSER))
#   define GTK_VRML_BROWSER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VRML_BROWSER, GtkVrmlBrowserClass))

typedef struct GtkVrmlBrowser_      GtkVrmlBrowser;
typedef struct GtkVrmlBrowserClass_ GtkVrmlBrowserClass;

struct GtkVrmlBrowser_ {
    GtkDrawingArea drawing_area;
    void *viewer;
};

struct GtkVrmlBrowserClass_ {
    GtkDrawingAreaClass parent_class;
};


GType gtk_vrml_browser_get_type(void) G_GNUC_CONST;
GtkWidget *gtk_vrml_browser_new(GIOChannel *request_channel);
void gtk_vrml_browser_load_url(GtkVrmlBrowser *vrml_browser,
                               const gchar **url,
                               const char **parameter);

G_END_DECLS

#   ifdef __cplusplus

namespace openvrml {
    class resource_istream;
}

//
// Since OpenVRML has a C++ interface, exposing this to C is Hard.
//
void gtk_vrml_browser_set_world(GtkVrmlBrowser * vrml_browser,
                                openvrml::resource_istream & in);
#   endif

# endif /* ifndef GTK_VRML_BROWSER_H */

--- NEW FILE: Makefile.am ---
AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/gtkglext \
        -I$(top_builddir)/lib/gtkglext \
        -I$(top_builddir)/lib/gtkglext/gdk \
        -I$(top_builddir)/src/libopenvrml \
        -I$(top_srcdir)/src/libopenvrml \
        -I$(top_builddir)/src/libopenvrml-gl \
        -I$(top_srcdir)/src/libopenvrml-gl \
        -I$(mozincludedir) \
        -DGTK_DISABLE_DEPRECATED
AM_CXXFLAGS = @PTHREAD_CFLAGS@ @GTK_CFLAGS@ @GL_CFLAGS@

if ENABLE_GTKPLUG
libexec_PROGRAMS = openvrml-gtkplug
endif
noinst_HEADERS = \
        bounded_buffer.h \
        command_istream.h \
        plugin_streambuf.h \
        gtkvrmlbrowser.h \
        flag.h
openvrml_gtkplug_SOURCES = \
        main.cpp \
        command_istream.cpp \
        plugin_streambuf.cpp \
        gtkvrmlbrowser.cpp \
        flag.cpp
openvrml_gtkplug_LDADD = \
        $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la \
        $(top_builddir)/src/libopenvrml/libopenvrml.la \
        $(top_builddir)/lib/gtkglext/gtk/libgtkglext-x11-1.0.la \
        $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la
openvrml_gtkplug_LDFLAGS = \
        @GTK_LIBS@ \
        @GL_LIBS@ \
        -lXmu -lXt @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ \
        -lboost_thread \
        @PTHREAD_LIBS@

EXTRA_DIST = $(openvrml_gtkplug_SOURCES)

--- NEW FILE: command_istream.cpp ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# include <cassert>
# include <cerrno>
# include "command_istream.h"

openvrml_player::command_streambuf::command_streambuf():
    c_('\0')
{
    this->setg(&this->c_, &this->c_, &this->c_);
}

openvrml_player::command_streambuf::int_type
openvrml_player::command_streambuf::underflow()
{
    const int_type i = this->source_buffer_.get();
    if (traits_type::eq_int_type(i, traits_type::eof())) {
        return traits_type::eof();
    }
    this->c_ = traits_type::to_char_type(i);
    this->setg(&this->c_, &this->c_, &this->c_ + 1);
    return i;
}


openvrml_player::command_istream::command_istream():
    std::istream(&this->buf_)
{}

gboolean command_data_available(GIOChannel * source,
                                GIOCondition,
                                gpointer data)
{
    using namespace openvrml_player;

    typedef command_istream::traits_type traits_type;

    command_streambuf & streambuf =
        *static_cast<command_streambuf *>(data);

    do {
        gchar c;
        gsize bytes_read;
        GError * error = 0;
        const GIOStatus status =
            g_io_channel_read_chars(source, &c, 1, &bytes_read, &error);
        if (status == G_IO_STATUS_ERROR) {
            if (error) {
                g_warning(error->message);
                g_error_free(error);
            }
            return false;
        }
        if (status == G_IO_STATUS_EOF) {
            streambuf.source_buffer_.set_eof();
            return false;
        }
        if (status == G_IO_STATUS_AGAIN) { continue; }
        g_return_val_if_fail(status == G_IO_STATUS_NORMAL, false);

        g_assert(bytes_read == 1);

        streambuf.source_buffer_.put(c);

    } while (g_io_channel_get_buffer_condition(source) & G_IO_IN);

    return true;
}

--- NEW FILE: flag.cpp ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# include "flag.h"

openvrml_player::flag::flag(const bool init):
    value_(init)
{}

bool openvrml_player::flag::value() const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    return this->value_;
}

void openvrml_player::flag::value(const bool val)
{
    boost::mutex::scoped_lock lock(this->mutex_);
    this->value_ = val;
}

--- NEW FILE: plugin_streambuf.cpp ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# include <glib.h>
# include "plugin_streambuf.h"

openvrml_player::plugin_streambuf::
plugin_streambuf(const std::string & requested_url):
    get_url_result_(-1),
    initialized_(false),
    url_(requested_url),
    i_(0),
    c_('\0')
{
    //
    // This is really just here to emphasize that c_ must not be EOF.
    //
    this->i_ = traits_type::not_eof(this->i_);
    this->c_ =
        traits_type::to_char_type(
            traits_type::not_eof(traits_type::to_int_type(this->c_)));

    this->setg(&this->c_, &this->c_, &this->c_);
}

void openvrml_player::plugin_streambuf::set_get_url_result(const int result)
{
    boost::mutex::scoped_lock lock(this->mutex_);
    assert(this->get_url_result_ == -1);
    this->get_url_result_ = result;
    this->received_get_url_result_.notify_all();
}

int openvrml_player::plugin_streambuf::get_url_result() const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    while (this->get_url_result_ == -1) {
        this->received_get_url_result_.wait(lock);
    }
    return this->get_url_result_;
}

void openvrml_player::plugin_streambuf::init(const size_t stream_id,
                                             const std::string & received_url,
                                             const std::string & type)
{
    boost::mutex::scoped_lock lock(this->mutex_);
    bool succeeded = uninitialized_plugin_streambuf_map_.erase(this->url_);
    g_assert(succeeded);
    this->url_ = received_url;
    this->type_ = type;
    this->initialized_ = true;
    const boost::shared_ptr<plugin_streambuf> this_ = shared_from_this();
    succeeded = plugin_streambuf_map.insert(make_pair(stream_id, this_))
        .second;
    g_assert(succeeded);
    this->streambuf_initialized_.notify_all();
}

const std::string & openvrml_player::plugin_streambuf::url() const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    while (!this->initialized_) {
        this->streambuf_initialized_.wait(lock);
    }
    return this->url_;
}

const std::string & openvrml_player::plugin_streambuf::type() const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    while (!this->initialized_) {
        this->streambuf_initialized_.wait(lock);
    }
    return this->type_;
}

bool openvrml_player::plugin_streambuf::data_available() const
{
    //
    // It may seem a bit counterintuitive to return true here if the stream
    // has been destroyed; however, if we don't return true in this case,
    // clients may never get EOF from the stream.
    //
    return this->buf_.buffered() > 0 || this->buf_.eof();
}

openvrml_player::plugin_streambuf::int_type
openvrml_player::plugin_streambuf::underflow()
{
    boost::mutex::scoped_lock lock(this->mutex_);
    while (!this->initialized_) {
        this->streambuf_initialized_.wait(lock);
    }

    if (traits_type::eq_int_type(this->i_, traits_type::eof())) {
        return traits_type::eof();
    }

    this->i_ = this->buf_.get();
    this->c_ = traits_type::to_char_type(this->i_);

    if (traits_type::eq_int_type(this->i_, traits_type::eof())) {
        return traits_type::eof();
    }

    this->setg(&this->c_, &this->c_, &this->c_ + 1);
    return traits_type::to_int_type(*this->gptr());
}


openvrml_player::uninitialized_plugin_streambuf_map
openvrml_player::uninitialized_plugin_streambuf_map_;

const boost::shared_ptr<openvrml_player::plugin_streambuf>
openvrml_player::uninitialized_plugin_streambuf_map::
find(const std::string & url) const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    map_t::const_iterator pos = this->map_.find(url);
    return pos == this->map_.end()
        ? boost::shared_ptr<plugin_streambuf>()
        : pos->second;
}

void
openvrml_player::uninitialized_plugin_streambuf_map::
insert(const std::string & url,
       const boost::shared_ptr<plugin_streambuf> & streambuf)
{
    boost::mutex::scoped_lock lock(this->mutex_);
    this->map_.insert(make_pair(url, streambuf));
}

/**
 * @brief Erase the first entry corresponding to @p url.
 *
 * The map may have multiple entries corresponding to @p url if the same
 * resource has been requested multiple times.  A single call to @c erase will
 * only remove one of them.
 *
 * @return @c true if an entry was removed; @c false otherwise.
 */
bool
openvrml_player::uninitialized_plugin_streambuf_map::
erase(const std::string & url)
{
    boost::mutex::scoped_lock lock(this->mutex_);
    const map_t::iterator pos = this->map_.find(url);
    if (pos == this->map_.end()) { return false; }
    this->map_.erase(pos);
    return true;
}

size_t openvrml_player::uninitialized_plugin_streambuf_map::size() const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    return this->map_.size();
}

const boost::shared_ptr<openvrml_player::plugin_streambuf>
openvrml_player::uninitialized_plugin_streambuf_map::front() const
{
    boost::mutex::scoped_lock lock(this->mutex_);
    g_assert(!this->map_.empty());
    return this->map_.begin()->second;
}


openvrml_player::plugin_streambuf_map_t openvrml_player::plugin_streambuf_map;

--- NEW FILE: bounded_buffer.h ---
// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
//
// OpenVRML Mozilla plug-in
// Copyright 2004, 2005, 2006  Braden N. McDaniel
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

# ifndef OPENVRML_PLAYER_BOUNDED_BUFFER_H
#   define OPENVRML_PLAYER_BOUNDED_BUFFER_H

#   include <string>
#   include <boost/thread/mutex.hpp>
#   include <boost/thread/condition.hpp>

namespace openvrml_player {

    template <typename CharT, size_t BufferSize>
    class bounded_buffer {
        mutable boost::mutex mutex_;
        boost::condition buffer_not_full_, buffer_not_empty_or_eof_;

        CharT buf_[BufferSize];
        size_t begin_, end_, buffered_;
        bool eof_;

    public:
        typedef CharT char_type;
        typedef typename std::char_traits<char_type> traits_type;
        typedef typename traits_type::int_type int_type;

        bounded_buffer();
        void put(const char_type & c);
        int_type get();
        size_t buffered() const;
        void set_eof();
        bool eof() const;
    };

    template <typename CharT, size_t BufferSize>
    bounded_buffer<CharT, BufferSize>::bounded_buffer():
        begin_(0),
        end_(0),
        buffered_(0),
        eof_(false)
    {}

    template <typename CharT, size_t BufferSize>
    void bounded_buffer<CharT, BufferSize>::put(const char_type & c)
    {
        boost::mutex::scoped_lock lock(this->mutex_);
        while (this->buffered_ == BufferSize) {
            this->buffer_not_full_.wait(lock);
        }
        this->buf_[this->end_] = c;
        this->end_ = (this->end_ + 1) % BufferSize;
        ++this->buffered_;
        this->buffer_not_empty_or_eof_.notify_one();
    }

    template <typename CharT, size_t BufferSize>
    typename bounded_buffer<CharT, BufferSize>::int_type
    bounded_buffer<CharT, BufferSize>::get()
    {
        boost::mutex::scoped_lock lock(this->mutex_);
        while (this->buffered_ == 0 && !this->eof_) {
            this->buffer_not_empty_or_eof_.wait(lock);
        }
        if (this->buffered_ == 0 && this->eof_) {
            return traits_type::eof();
        }
        const int_type c = traits_type::to_int_type(this->buf_[this->begin_]);
        this->begin_ = (this->begin_ + 1) % BufferSize;
        --this->buffered_;
        this->buffer_not_full_.notify_one();
        assert(!traits_type::eq_int_type(c, traits_type::eof()));
        return c;
    }

    template <typename CharT, size_t BufferSize>
    size_t bounded_buffer<CharT, BufferSize>::buffered() const
    {
        boost::mutex::scoped_lock lock(this->mutex_);
        return this->buffered_;
    }

    template <typename CharT, size_t BufferSize>
    void bounded_buffer<CharT, BufferSize>::set_eof()
    {
        boost::mutex::scoped_lock lock(this->mutex_);
        this->eof_ = true;
        this->buffer_not_empty_or_eof_.notify_one();
    }

    template <typename CharT, size_t BufferSize>
    bool bounded_buffer<CharT, BufferSize>::eof() const
    {
        boost::mutex::scoped_lock lock(this->mutex_);
        return this->eof_;
    }
}

# endif // ifndef OPENVRML_PLAYER_BOUNDED_BUFFER_H

[openvrml-commit] openvrml/src Makefile.am,1.6,1.7

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/src

Modified Files:
	Makefile.am 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	22 Mar 2005 03:13:12 -0000	1.6
--- Makefile.am	1 Oct 2006 05:47:07 -0000	1.7
***************
*** 1 ****
! SUBDIRS = libopenvrml libopenvrml-gl
--- 1 ----
! SUBDIRS = libopenvrml libopenvrml-gl openvrml-gtkplug

[openvrml-commit] openvrml/mozilla-plugin/src/openvrml-player .cvsignore, 1.2, NONE Makefile.am, 1.9, NONE bounded_buffer.h, 1.2, NONE command_istream.cpp, 1.5, NONE command_istream.h, 1.3, NONE flag.cpp, 1.1, NONE flag.h, 1.1, NONE gtkvrmlbrowser.cpp, 1.6, NONE gtkvrmlbrowser.h, 1.1, NONE player.cpp, 1.31, NONE plugin_streambuf.cpp, 1.11, NONE plugin_streambuf.h, 1.10, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/src/openvrml-player

Removed Files:
	.cvsignore Makefile.am bounded_buffer.h command_istream.cpp 
	command_istream.h flag.cpp flag.h gtkvrmlbrowser.cpp 
	gtkvrmlbrowser.h player.cpp plugin_streambuf.cpp 
	plugin_streambuf.h 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- .cvsignore DELETED ---

--- gtkvrmlbrowser.cpp DELETED ---

--- plugin_streambuf.h DELETED ---

--- flag.h DELETED ---

--- command_istream.h DELETED ---

--- gtkvrmlbrowser.h DELETED ---

--- Makefile.am DELETED ---

--- command_istream.cpp DELETED ---

--- flag.cpp DELETED ---

--- player.cpp DELETED ---

--- plugin_streambuf.cpp DELETED ---

--- bounded_buffer.h DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/src Makefile.am, 1.13, 1.14 openvrml.cpp, 1.38, 1.39

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/src

Modified Files:
	Makefile.am openvrml.cpp 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** openvrml.cpp	26 Sep 2006 12:52:36 -0000	1.38
--- openvrml.cpp	1 Oct 2006 05:47:07 -0000	1.39
***************
*** 1063,1068 ****
  
              //
!             // The OPENVRML_PLAYER environment variable overrides the default
!             // path to the child process executable.  To allow OPENVRML_PLAYER
              // to include arguments (rather than just be a path to an
              // executable), it is parsed with g_shell_parse_argv.  This is
--- 1063,1068 ----
  
              //
!             // The OPENVRML_GTKPLUG environment variable overrides the default
!             // path to the child process executable.  To allow OPENVRML_GTKPLUG
              // to include arguments (rather than just be a path to an
              // executable), it is parsed with g_shell_parse_argv.  This is
***************
*** 1070,1091 ****
              // a harness like valgrind.
              //
!             gint openvrml_player_cmd_argc = 0;
!             gchar ** openvrml_player_cmd_argv = 0;
!             const gchar * const openvrml_player_cmd =
!                 g_getenv("OPENVRML_PLAYER");
!             if (!openvrml_player_cmd) {
!                 openvrml_player_cmd_argc = 1;
!                 openvrml_player_cmd_argv =
                      static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2));
!                 if (!openvrml_player_cmd_argv) { throw std::bad_alloc(); }
!                 openvrml_player_cmd_argv[0] =
!                     g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-player");
!                 if (!openvrml_player_cmd_argv[0]) { throw std::bad_alloc(); }
              } else {
                  GError * error = 0;
                  gboolean succeeded =
!                     g_shell_parse_argv(openvrml_player_cmd,
!                                        &openvrml_player_cmd_argc,
!                                        &openvrml_player_cmd_argv,
                                         &error);
                  if (!succeeded) {
--- 1070,1091 ----
              // a harness like valgrind.
              //
!             gint openvrml_gtkplug_cmd_argc = 0;
!             gchar ** openvrml_gtkplug_cmd_argv = 0;
!             const gchar * const openvrml_gtkplug_cmd =
!                 g_getenv("OPENVRML_GTKPLUG");
!             if (!openvrml_gtkplug_cmd) {
!                 openvrml_gtkplug_cmd_argc = 1;
!                 openvrml_gtkplug_cmd_argv =
                      static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2));
!                 if (!openvrml_gtkplug_cmd_argv) { throw std::bad_alloc(); }
!                 openvrml_gtkplug_cmd_argv[0] =
!                     g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-gtkplug");
!                 if (!openvrml_gtkplug_cmd_argv[0]) { throw std::bad_alloc(); }
              } else {
                  GError * error = 0;
                  gboolean succeeded =
!                     g_shell_parse_argv(openvrml_gtkplug_cmd,
!                                        &openvrml_gtkplug_cmd_argc,
!                                        &openvrml_gtkplug_cmd_argv,
                                         &error);
                  if (!succeeded) {
***************
*** 1103,1113 ****
                  socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!             const gint argv_size = openvrml_player_cmd_argc + 2;
              gchar ** const argv =
                  static_cast<gchar **>(g_malloc(sizeof (gchar *) * argv_size));
              if (!argv) { throw std::bad_alloc(); }
              gint i;
!             for (i = 0; i < openvrml_player_cmd_argc; ++i) {
!                 argv[i] = openvrml_player_cmd_argv[i];
              }
              argv[i++] = &socket_id_arg_vec.front();
--- 1103,1113 ----
                  socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!             const gint argv_size = openvrml_gtkplug_cmd_argc + 2;
              gchar ** const argv =
                  static_cast<gchar **>(g_malloc(sizeof (gchar *) * argv_size));
              if (!argv) { throw std::bad_alloc(); }
              gint i;
!             for (i = 0; i < openvrml_gtkplug_cmd_argc; ++i) {
!                 argv[i] = openvrml_gtkplug_cmd_argv[i];
              }
              argv[i++] = &socket_id_arg_vec.front();
***************
*** 1145,1149 ****
              g_free(working_directory);
              g_free(argv);
!             g_strfreev(openvrml_player_cmd_argv);
  
              if (succeeded) {
--- 1145,1149 ----
              g_free(working_directory);
              g_free(argv);
!             g_strfreev(openvrml_gtkplug_cmd_argv);
  
              if (succeeded) {

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	28 May 2005 06:44:39 -0000	1.13
--- Makefile.am	1 Oct 2006 05:47:07 -0000	1.14
***************
*** 1,4 ****
- SUBDIRS = openvrml-player
- 
  AM_CPPFLAGS = \
          -I$(mozincludedir) \
--- 1,2 ----

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/m4macros .cvsignore, 1.1, NONE Makefile.am, 1.2, NONE gtkglext.m4, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/m4macros
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/m4macros

Removed Files:
	.cvsignore Makefile.am gtkglext.m4 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- gtkglext.m4 DELETED ---

--- .cvsignore DELETED ---

--- Makefile.am DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/gtk .cvsignore, 1.1, NONE Makefile.am, 1.2, NONE gen-def-file.sh, 1.1.1.1, NONE gtkgl.h, 1.1.1.1, NONE gtkgldebug.h, 1.1.1.1, NONE gtkgldefs.h, 1.1.1.1, NONE gtkglext.def, 1.1.1.1, NONE gtkglinit.c, 1.1.1.1, NONE gtkglinit.h, 1.1.1.1, NONE gtkglprivate.h, 1.1.1.1, NONE gtkglversion.c, 1.1.1.1, NONE gtkglversion.h.in, 1.1.1.1, NONE gtkglwidget.c, 1.1.1.1, NONE gtkglwidget.h, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/gtk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/gtk

Removed Files:
	.cvsignore Makefile.am gen-def-file.sh gtkgl.h gtkgldebug.h 
	gtkgldefs.h gtkglext.def gtkglinit.c gtkglinit.h 
	gtkglprivate.h gtkglversion.c gtkglversion.h.in gtkglwidget.c 
	gtkglwidget.h 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- .cvsignore DELETED ---

--- gtkglinit.c DELETED ---

--- gtkglversion.c DELETED ---

--- gtkgl.h DELETED ---

--- gtkgldefs.h DELETED ---

--- gtkglinit.h DELETED ---

--- gtkglext.def DELETED ---

--- gtkglwidget.h DELETED ---

--- Makefile.am DELETED ---

--- gtkglversion.h.in DELETED ---

--- gtkglprivate.h DELETED ---

--- gen-def-file.sh DELETED ---

--- gtkgldebug.h DELETED ---

--- gtkglwidget.c DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/gdk/x11 .cvsignore, 1.1, NONE Makefile.am, 1.2, NONE gdkglconfig-x11.c, 1.2, NONE gdkglconfig-x11.h, 1.1.1.1, NONE gdkglcontext-x11.c, 1.1.1.1, NONE gdkglcontext-x11.h, 1.1.1.1, NONE gdkgldrawable-x11.c, 1.1.1.1, NONE gdkglfont-x11.c, 1.1.1.1, NONE gdkglglxext.c, 1.1.1.1, NONE gdkglglxext.h, 1.1.1.1, NONE gdkgloverlay-x11.c, 1.1.1.1, NONE gdkgloverlay-x11.h, 1.1.1.1, NONE gdkglpixmap-x11.c, 1.1.1.1, NONE gdkglpixmap-x11.h, 1.1.1.1, NONE gdkglprivate-x11.h, 1.1.1.1, NONE gdkglquery-x11.c, 1.3, NONE gdkglwindow-x11.c, 1.1.1.1, NONE gdkglwindow-x11.h, 1.1.1.1, NONE gdkglx.h, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/gdk/x11
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/gdk/x11

Removed Files:
	.cvsignore Makefile.am gdkglconfig-x11.c gdkglconfig-x11.h 
	gdkglcontext-x11.c gdkglcontext-x11.h gdkgldrawable-x11.c 
	gdkglfont-x11.c gdkglglxext.c gdkglglxext.h gdkgloverlay-x11.c 
	gdkgloverlay-x11.h gdkglpixmap-x11.c gdkglpixmap-x11.h 
	gdkglprivate-x11.h gdkglquery-x11.c gdkglwindow-x11.c 
	gdkglwindow-x11.h gdkglx.h 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- .cvsignore DELETED ---

--- gdkglpixmap-x11.c DELETED ---

--- gdkglcontext-x11.c DELETED ---

--- gdkglconfig-x11.h DELETED ---

--- gdkgloverlay-x11.h DELETED ---

--- gdkglwindow-x11.h DELETED ---

--- gdkglpixmap-x11.h DELETED ---

--- gdkglwindow-x11.c DELETED ---

--- gdkgloverlay-x11.c DELETED ---

--- gdkglconfig-x11.c DELETED ---

--- gdkglcontext-x11.h DELETED ---

--- gdkglglxext.c DELETED ---

--- Makefile.am DELETED ---

--- gdkglfont-x11.c DELETED ---

--- gdkglglxext.h DELETED ---

--- gdkglprivate-x11.h DELETED ---

--- gdkgldrawable-x11.c DELETED ---

--- gdkglx.h DELETED ---

--- gdkglquery-x11.c DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/gdk/win32 .cvsignore, 1.1, NONE Makefile.am, 1.2, NONE gdkglconfig-win32.c, 1.1.1.1, NONE gdkglconfig-win32.h, 1.1.1.1, NONE gdkglcontext-win32.c, 1.1.1.1, NONE gdkglcontext-win32.h, 1.1.1.1, NONE gdkgldrawable-win32.c, 1.1.1.1, NONE gdkglfont-win32.c, 1.1.1.1, NONE gdkglpixmap-win32.c, 1.1.1.1, NONE gdkglpixmap-win32.h, 1.1.1.1, NONE gdkglprivate-win32.h, 1.1.1.1, NONE gdkglquery-win32.c, 1.1.1.1, NONE gdkglwglext.c, 1.1.1.1, NONE gdkglwglext.h, 1.1.1.1, NONE gdkglwin32.h, 1.1.1.1, NONE gdkglwindow-win32.c, 1.1.1.1, NONE gdkglwindow-win32.h, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/gdk/win32
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/gdk/win32

Removed Files:
	.cvsignore Makefile.am gdkglconfig-win32.c gdkglconfig-win32.h 
	gdkglcontext-win32.c gdkglcontext-win32.h 
	gdkgldrawable-win32.c gdkglfont-win32.c gdkglpixmap-win32.c 
	gdkglpixmap-win32.h gdkglprivate-win32.h gdkglquery-win32.c 
	gdkglwglext.c gdkglwglext.h gdkglwin32.h gdkglwindow-win32.c 
	gdkglwindow-win32.h 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- .cvsignore DELETED ---

--- gdkglcontext-win32.h DELETED ---

--- gdkglconfig-win32.h DELETED ---

--- gdkglprivate-win32.h DELETED ---

--- gdkglpixmap-win32.h DELETED ---

--- gdkglfont-win32.c DELETED ---

--- gdkglwin32.h DELETED ---

--- gdkglcontext-win32.c DELETED ---

--- gdkglconfig-win32.c DELETED ---

--- gdkglwindow-win32.c DELETED ---

--- gdkglwglext.c DELETED ---

--- Makefile.am DELETED ---

--- gdkgldrawable-win32.c DELETED ---

--- gdkglwglext.h DELETED ---

--- gdkglwindow-win32.h DELETED ---

--- gdkglpixmap-win32.c DELETED ---

--- gdkglquery-win32.c DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/gdk/glext .cvsignore, 1.1, NONE Makefile.am, 1.2, NONE README, 1.1.1.1, NONE common-header.h, 1.1.1.1, NONE gen-gdkglglext-c.pl, 1.1.1.1, NONE gen-gdkglglext-h.pl, 1.1.1.1, NONE gen-gdkglglxext-c.pl, 1.1.1.1, NONE gen-gdkglglxext-h.pl, 1.1.1.1, NONE gen-gdkglwglext-c.pl, 1.1.1.1, NONE gen-gdkglwglext-h.pl, 1.1.1.1, NONE glext-extra.h, 1.1.1.1, NONE glext.h, 1.1.1.1, NONE glxext-extra.h, 1.1.1.1, NONE glxext.h, 1.1.1.1, NONE list-ext.pl, 1.1.1.1, NONE wglext-extra.h, 1.1.1.1, NONE wglext.h, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/gdk/glext
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/gdk/glext

Removed Files:
	.cvsignore Makefile.am README common-header.h 
	gen-gdkglglext-c.pl gen-gdkglglext-h.pl gen-gdkglglxext-c.pl 
	gen-gdkglglxext-h.pl gen-gdkglwglext-c.pl gen-gdkglwglext-h.pl 
	glext-extra.h glext.h glxext-extra.h glxext.h list-ext.pl 
	wglext-extra.h wglext.h 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- gen-gdkglglext-c.pl DELETED ---

--- .cvsignore DELETED ---

--- common-header.h DELETED ---

--- gen-gdkglwglext-c.pl DELETED ---

--- wglext.h DELETED ---

--- gen-gdkglwglext-h.pl DELETED ---

--- gen-gdkglglxext-h.pl DELETED ---

--- gen-gdkglglxext-c.pl DELETED ---

--- glxext-extra.h DELETED ---

--- gen-gdkglglext-h.pl DELETED ---

--- glext.h DELETED ---

--- README DELETED ---

--- glxext.h DELETED ---

--- list-ext.pl DELETED ---

--- glext-extra.h DELETED ---

--- Makefile.am DELETED ---

--- wglext-extra.h DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/gdk .cvsignore, 1.1, NONE Makefile.am, 1.2, NONE gdkgl.h, 1.1.1.1, NONE gdkglconfig.c, 1.2, NONE gdkglconfig.h, 1.1.1.1, NONE gdkglcontext.c, 1.1.1.1, NONE gdkglcontext.h, 1.1.1.1, NONE gdkgldebug.h, 1.1.1.1, NONE gdkgldefs.h, 1.1.1.1, NONE gdkgldrawable.c, 1.1.1.1, NONE gdkgldrawable.h, 1.1.1.1, NONE gdkglext-gtk20.def, 1.1.1.1, NONE gdkglext.def, 1.1.1.1, NONE gdkglfont.h, 1.1.1.1, NONE gdkglglext.c, 1.1.1.1, NONE gdkglglext.h, 1.1.1.1, NONE gdkglinit.c, 1.1.1.1, NONE gdkglinit.h, 1.1.1.1, NONE gdkglpixmap.c, 1.1.1.1, NONE gdkglpixmap.h, 1.1.1.1, NONE gdkglprivate.h, 1.1.1.1, NONE gdkglquery.c, 1.1.1.1, NONE gdkglquery.h, 1.1.1.1, NONE gdkglshapes.c, 1.1.1.1, NONE gdkglshapes.h, 1.1.1.1, NONE gdkgltokens.h, 1.1.1.1, NONE gdkgltypes.h, 1.1.1.1, NONE gdkglversion.c, 1.1.1.1, NONE gdkglversion.h.in, 1.1.1.1, NONE gdkglwindow.c, 1.1.1.1, NONE gdkglwindow.h, 1.1.1.1, NONE gen-def-file.sh, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/gdk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/gdk

Removed Files:
	.cvsignore Makefile.am gdkgl.h gdkglconfig.c gdkglconfig.h 
	gdkglcontext.c gdkglcontext.h gdkgldebug.h gdkgldefs.h 
	gdkgldrawable.c gdkgldrawable.h gdkglext-gtk20.def 
	gdkglext.def gdkglfont.h gdkglglext.c gdkglglext.h gdkglinit.c 
	gdkglinit.h gdkglpixmap.c gdkglpixmap.h gdkglprivate.h 
	gdkglquery.c gdkglquery.h gdkglshapes.c gdkglshapes.h 
	gdkgltokens.h gdkgltypes.h gdkglversion.c gdkglversion.h.in 
	gdkglwindow.c gdkglwindow.h gen-def-file.sh 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- gdkglext.def DELETED ---

--- gdkglversion.h.in DELETED ---

--- gdkgltypes.h DELETED ---

--- gdkgl.h DELETED ---

--- gdkglquery.c DELETED ---

--- gdkglquery.h DELETED ---

--- Makefile.am DELETED ---

--- gdkgltokens.h DELETED ---

--- gdkglprivate.h DELETED ---

--- gdkgldrawable.c DELETED ---

--- gdkglconfig.h DELETED ---

--- gdkglwindow.c DELETED ---

--- gdkglglext.h DELETED ---

--- gdkglglext.c DELETED ---

--- gdkglwindow.h DELETED ---

--- gdkglfont.h DELETED ---

--- .cvsignore DELETED ---

--- gdkglcontext.c DELETED ---

--- gdkglversion.c DELETED ---

--- gdkglext-gtk20.def DELETED ---

--- gdkglshapes.c DELETED ---

--- gdkglcontext.h DELETED ---

--- gdkglshapes.h DELETED ---

--- gdkglinit.h DELETED ---

--- gdkglconfig.c DELETED ---

--- gdkgldebug.h DELETED ---

--- gen-def-file.sh DELETED ---

--- gdkglinit.c DELETED ---

--- gdkgldefs.h DELETED ---

--- gdkglpixmap.h DELETED ---

--- gdkgldrawable.h DELETED ---

--- gdkglpixmap.c DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/examples/glade .cvsignore, 1.1, NONE Makefile.am, 1.1.1.1, NONE README, 1.1.1.1, NONE share-lists.c, 1.1.1.1, NONE share-lists.glade, 1.1.1.1, NONE simple.c, 1.1.1.1, NONE simple.glade, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/examples/glade
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/examples/glade

Removed Files:
	.cvsignore Makefile.am README share-lists.c share-lists.glade 
	simple.c simple.glade 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- .cvsignore DELETED ---

--- share-lists.c DELETED ---

--- simple.c DELETED ---

--- simple.glade DELETED ---

--- Makefile.am DELETED ---

--- README DELETED ---

--- share-lists.glade DELETED ---

[openvrml-commit] openvrml/mozilla-plugin/lib/gtkglext/examples .cvsignore, 1.1, NONE Makefile.am, 1.1.1.1, NONE Makefile.mingw, 1.1.1.1, NONE Makefile.msc, 1.1.1.1, NONE alien.lwo, 1.1.1.1, NONE button.c, 1.1.1.1, NONE color.c, 1.1.1.1, NONE coolwave.c, 1.1.1.1, NONE coolwave2.c, 1.1.1.1, NONE font-pangoft2-tex.c, 1.1.1.1, NONE font-pangoft2.c, 1.1.1.1, NONE font.c, 1.1.1.1, NONE gears.c, 1.1.1.1, NONE girl.rgb, 1.1.1.1, NONE glxinfo.c, 1.1.1.1, NONE logo-g.c, 1.1.1.1, NONE logo-k.c, 1.1.1.1, NONE logo-model.c, 1.1.1.1, NONE logo-model.h, 1.1.1.1, NONE logo-t.c, 1.1.1.1, NONE logo.c, 1.1.1.1, NONE low-level.c, 1.1.1.1, NONE lw.c, 1.1.1.1, NONE lw.h, 1.1.1.1, NONE multiarb.c, 1.1.1.1, NONE penguin.lwo, 1.1.1.1, NONE pixmap-mixed.c, 1.1.1.1, NONE pixmap.c, 1.1.1.1, NONE readtex.c, 1.1.1.1, NONE readtex.h, 1.1.1.1, NONE reflect.rgb, 1.1.1.1, NONE rotating-square.c, 1.1.1.1, NONE scribble-gl.c, 1.1.1.1, NONE shapes.c, 1.1.1.1, NONE share-lists.c, 1.1.1.1, NONE simple-mixed.c, 1.1.1.1, NONE simple-pbuffer-sgix.c, 1.1.1.1, NONE simple.c, 1.1.1.1, NONE template.c, 1.1.1.1, NONE trackball.c, 1.1.1.1, NONE trackball.h, 1.1.1.1, NONE viewlw.c, 1.1.1.1, NONE wglinfo.c, 1.1.1.1, NONE

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/lib/gtkglext/examples
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6480/mozilla-plugin/lib/gtkglext/examples

Removed Files:
	.cvsignore Makefile.am Makefile.mingw Makefile.msc alien.lwo 
	button.c color.c coolwave.c coolwave2.c font-pangoft2-tex.c 
	font-pangoft2.c font.c gears.c girl.rgb glxinfo.c logo-g.c 
	logo-k.c logo-model.c logo-model.h logo-t.c logo.c low-level.c 
	lw.c lw.h multiarb.c penguin.lwo pixmap-mixed.c pixmap.c 
	readtex.c readtex.h reflect.rgb rotating-square.c 
	scribble-gl.c shapes.c share-lists.c simple-mixed.c 
	simple-pbuffer-sgix.c simple.c template.c trackball.c 
	trackball.h viewlw.c wglinfo.c 
Log Message:
Build/package the GtkPlug application separately from the Mozilla plug-in.  The Mozilla plug-in is just one possible client for this application.

--- rotating-square.c DELETED ---

--- viewlw.c DELETED ---

--- logo-t.c DELETED ---

--- logo.c DELETED ---

--- shapes.c DELETED ---

--- readtex.h DELETED ---

--- alien.lwo DELETED ---

--- reflect.rgb DELETED ---

--- Makefile.msc DELETED ---

--- coolwave2.c DELETED ---

--- button.c DELETED ---

--- readtex.c DELETED ---

--- gears.c DELETED ---

--- .cvsignore DELETED ---

--- penguin.lwo DELETED ---

--- share-lists.c DELETED ---

--- low-level.c DELETED ---

--- coolwave.c DELETED ---

--- font-pangoft2.c DELETED ---

--- logo-g.c DELETED ---

--- Makefile.am DELETED ---

--- scribble-gl.c DELETED ---

--- Makefile.mingw DELETED ---

--- trackball.c DELETED ---

--- font.c DELETED ---

--- pixmap-mixed.c DELETED ---

--- trackball.h DELETED ---

--- logo-model.c DELETED ---

--- lw.c DELETED ---

--- logo-model.h DELETED ---

--- logo-k.c DELETED ---

--- lw.h DELETED ---

--- wglinfo.c DELETED ---

--- multiarb.c DELETED ---

--- font-pangoft2-tex.c DELETED ---

--- template.c DELETED ---

--- simple-pbuffer-sgix.c DELETED ---

--- simple-mixed.c DELETED ---

--- simple.c DELETED ---

--- girl.rgb DELETED ---

--- glxinfo.c DELETED ---

--- pixmap.c DELETED ---

--- color.c DELETED ---