From: Matt Birkholz Date: Tue, 29 Mar 2016 22:09:58 +0000 (-0700) Subject: gtk: Use libtool/automake. X-Git-Tag: mit-scheme-pucked-9.2.12~352 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a4d452a6ce0011524526cd70bc66c43ddf763010;p=mit-scheme.git gtk: Use libtool/automake. --- diff --git a/src/gtk/AUTHORS b/src/gtk/AUTHORS new file mode 100644 index 000000000..11c76de3b --- /dev/null +++ b/src/gtk/AUTHORS @@ -0,0 +1,5 @@ +To find out what should go in this file, see "Information For +Maintainers of GNU Software" (maintain.texi), the section called +"Recording Changes". + +Matthew Birkholz Everything up to the initial automake conversion. diff --git a/src/gtk/COPYING b/src/gtk/COPYING new file mode 100644 index 000000000..bf50f20de --- /dev/null +++ b/src/gtk/COPYING @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 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. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + 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 Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, 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 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 a program 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. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, 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 companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + 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, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +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. + + 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. + + 6. As an exception to the Sections above, you may also compile 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) 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. + + c) 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. + + d) 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 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. + + 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. + + 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 to +this License. + + 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 Library 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. + + 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 + + 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. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; 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. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/src/gtk/ChangeLog b/src/gtk/ChangeLog new file mode 100644 index 000000000..f6022f673 --- /dev/null +++ b/src/gtk/ChangeLog @@ -0,0 +1,8 @@ +-*-Text-*- + +Please see the git commit log: + +$ git clone git://git.savannah.gnu.org/mit-scheme.git +$ git remote add puck git://birchwood-abbey.net/~matt/mit-scheme.git +$ git fetch puck Gtk +$ git log puck/Gtk -- src/gtk/ | more diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am new file mode 100644 index 000000000..225cb7d7e --- /dev/null +++ b/src/gtk/Makefile.am @@ -0,0 +1,166 @@ +## Process this file with automake to produce Makefile.in +## +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +## 2016 Matthew Birkholz +## +## This file is part of a gtk plugin for MIT/GNU Scheme. +## +## This plugin 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 plugin 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 plugin; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +## 02110-1301, USA. + +ACLOCAL_AMFLAGS = -I m4 +EXTRA_DIST = autogen.sh + +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ +scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@ +scmlib_gtkdir = $(scmlibdir)/gtk + +scmlib_LTLIBRARIES = gtk-shim.la +scmlib_DATA = gtk-types.bin gtk-const.bin + +scmlib_gtk_DATA = conses.png +scmlib_gtk_DATA += gtk-widget.scm gtk-widget.bin gtk-widget.bci gtk-widget.com +scmlib_gtk_DATA += scm-widget.scm scm-widget.bin scm-widget.bci scm-widget.com +scmlib_gtk_DATA += fix-layout.scm fix-layout.bin fix-layout.bci fix-layout.com +scmlib_gtk_DATA += keys.scm keys.bin keys.bci keys.com +scmlib_gtk_DATA += main.scm main.bin main.bci main.com +scmlib_gtk_DATA += gtk-ev.scm gtk-ev.bin gtk-ev.bci gtk-ev.com +scmlib_gtk_DATA += gtk-graphics.scm gtk-graphics.bin +scmlib_gtk_DATA += gtk-graphics.bci gtk-graphics.com +scmlib_gtk_DATA += fix-demo.scm fix-demo.bin fix-demo.bci fix-demo.com +scmlib_gtk_DATA += swat.scm swat.bin swat.bci swat.com +scmlib_gtk_DATA += swat-pole-zero.scm swat-pole-zero.bin +scmlib_gtk_DATA += swat-pole-zero.bci swat-pole-zero.com +scmlib_gtk_DATA += gdk.scm gdk.bin gdk.bci gdk.com +scmlib_gtk_DATA += gtk.scm gtk.bin gtk.bci gtk.com +scmlib_gtk_DATA += make.scm gtk-@MIT_SCHEME_OS_SUFFIX@.pkd + +info_TEXINFOS = mit-scheme-gtk.texi +AM_MAKEINFOHTMLFLAGS = --no-split + +# Set these to the defaults used by Scheme. +infodir = $(datarootdir)/info +htmldir = $(libdir)/mit-scheme/doc +dvidir = $(libdir)/mit-scheme/doc +pdfdir = $(libdir)/mit-scheme/doc + +AM_CPPFLAGS = -I$(scmlibdir) +AM_CFLAGS = `pkg-config --cflags gtk+-3.0` +LIBS = `pkg-config --libs gtk+-3.0 gthread-2.0` + +gtk_shim_la_LIBADD = gtkpanedview.lo gtkscrolledview.lo scmwidget.lo gtkio.lo +gtk_shim_la_LDFLAGS = -module -avoid-version -shared + +noinst_PROGRAMS = gtk-const +gtk_const_SOURCES = gtk-const.c gtk-shim.h + +gtk-shim.c: stamp-shim +gtk-const.c: stamp-shim +gtk-types.bin: stamp-shim +stamp-shim: gtk.cdecl gtk-shim.h Includes/*.cdecl + touch stamp-shim + echo '(generate-shim "gtk" "#include \"gtk-shim.h\"")' \ + | $(MIT_SCHEME_EXE) --batch-mode \ + || rm stamp-shim + +gtk-shim.o: gtk-shim.c gtk-shim.h + +gtkpanedview.o: gtkpanedview.c gtkpanedview.h + +gtkscrolledview.o: gtkscrolledview.c gtkscrolledview.h + +scmwidget.o: scmwidget.c scmwidget.h + +gtk-const.bin: gtk-const.scm + echo '(sf "gtk-const")' | $(MIT_SCHEME_EXE) --batch-mode + +gtk-const.scm: gtk-const + ./gtk-const + +gtk-widget.bin: stamp-scheme +gtk-widget.bci: stamp-scheme +gtk-widget.com: stamp-scheme +scm-widget.bin: stamp-scheme +scm-widget.bci: stamp-scheme +scm-widget.com: stamp-scheme +fix-layout.bin: stamp-scheme +fix-layout.bci: stamp-scheme +fix-layout.com: stamp-scheme +keys.bin: stamp-scheme +keys.bci: stamp-scheme +keys.com: stamp-scheme +main.bin: stamp-scheme +main.bci: stamp-scheme +main.com: stamp-scheme +gtk-ev.bin: stamp-scheme +gtk-ev.bci: stamp-scheme +gtk-ev.com: stamp-scheme +gtk-graphics.bin: stamp-scheme +gtk-graphics.bci: stamp-scheme +gtk-graphics.com: stamp-scheme +fix-demo.bin: stamp-scheme +fix-demo.bci: stamp-scheme +fix-demo.com: stamp-scheme +swat.bin: stamp-scheme +swat.bci: stamp-scheme +swat.com: stamp-scheme +swat-pole-zero.bin: stamp-scheme +swat-pole-zero.bci: stamp-scheme +swat-pole-zero.com: stamp-scheme +gdk.bin: stamp-scheme +gdk.bci: stamp-scheme +gdk.com: stamp-scheme +gtk.bin: stamp-scheme +gtk.bci: stamp-scheme +gtk.com: stamp-scheme +gtk-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +stamp-scheme: stamp-shim gtk-widget.scm scm-widget.scm fix-layout.scm \ + keys.scm main.scm gtk-ev.scm gtk-graphics.scm fix-demo.scm \ + swat.scm swat-pole-zero.scm gdk.scm gtk.scm + touch stamp-scheme + ./compile.sh || rm stamp-scheme + +CLEANFILES = gtk-const* gtk-shim.c +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd + +TESTS = gtk-check.sh + +check-local: + ./check-doc.sh + +ETAGS_FILES = gtk-widget.scm scm-widget.scm fix-layout.scm +ETAGS_FILES += keys.scm main.scm gtk-ev.scm gtk-graphics.scm +ETAGS_FILES += fix-demo.scm swat.scm swat-pole-zero.scm +ETAGS_FILES += gdk.scm gtk.scm +ETAGS_CDECLS = gtk.cdecl Includes/*.cdecl +ETAGS_ARGS = $(ETAGS_FILES) -r '/^([^iI].*/' $(ETAGS_CDECLS) +TAGS_DEPENDENCIES = $(ETAGS_FILES) $(ETAGS_CDECLS) + +install-data-hook: + echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode + +uninstall-hook: + echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode + [ -d "$(DESTDIR)$(scmlib_gtkdir)" ] \ + && rmdir "$(DESTDIR)$(scmlib_gtkdir)" + [ -d "$(DESTDIR)$(htmldir)" ] \ + && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in deleted file mode 100644 index 743a817d6..000000000 --- a/src/gtk/Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright (C) 2011, 2012, 2013, 2014, 2015 Matthew Birkholz -# -# This file is part of an extension to MIT/GNU Scheme. -# -# MIT/GNU Scheme 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. -# -# MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301, USA. - -MIT_SCHEME_EXE = mit-scheme -exe = '$(MIT_SCHEME_EXE)' --batch-mode - -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ - -prefix = @prefix@ -datarootdir = @datarootdir@ -infodir = @infodir@ - -all: gtk-shim.so gtk-types.bin gtk-const.bin - echo '(load "compile")' | $(exe) - @if [ -s gtk-unx.crf ]; then \ - echo "gtk-unx.crf:0: warning: non-empty"; exit 1; fi - -check: - ( echo '(begin'; \ - echo ' (load "check")'; \ - echo ' (load "check-doc"))' ) | $(exe) - -doc: mit-scheme-gtk.info -doc: mit-scheme-gtk.html - -mit-scheme-gtk.info: gtk.texinfo - makeinfo --no-split --output=$@ $^ - -mit-scheme-gtk.html: gtk.texinfo - makeinfo --html --no-split --output=$@ $^ - -.PHONY: all check doc - -install: - ( echo '(begin'; \ - echo ' (install-shim "$(DESTDIR)" "gtk")'; \ - echo ' (install-load-option "$(DESTDIR)" "gtk"))' ) \ - | $(exe) -- *.com *.bci *.pkd make.scm conses.png - -install-info: mit-scheme-gtk.info - install $< $(DESTDIR)$(infodir)/ - install-info $< $(DESTDIR)$(infodir)/dir - -install-html: mit-scheme-gtk.html - echo "(install-html \"$(DESTDIR)\" \"GNOME interface\")" | $(exe) -- $< - -.PHONY: install install-info install-html - -clean: - rm -f gtk-const.scm gtk-const gtk-const.c gtk-shim.c - rm -f gtk-*.crf gtk-*.fre gtk-*.pkd - rm -f *.o *.so *.bin *.ext *.com *.bci *.moc *.fni - rm -f mit-scheme-gtk.html mit-scheme-gtk.info - -distclean: clean - rm -f Makefile config.h config.log config.status - -maintainer-clean: distclean - rm -f configure config.h.in TAGS - rm -rf autom4te.cache - rm -f gtkscrolledview.c gtkpanedview.c - -tags: - etags *.h \ - `echo *.c | sed 's/ gtk-const.c//; s/ gtk-shim.c//'` \ - `echo *.scm | sed 's/ gtk-const.scm//'` \ - -r '/^([^iI].*/' Includes/*.cdecl - echo "\f\n../cairo/TAGS,include" >>TAGS - -.PHONY: clean distclean maintainer-clean tags - -gtk-shim.so: gtk-shim.o gtkpanedview.o gtkscrolledview.o scmwidget.o gtkio.o - echo "(link-shim)" | $(exe) -- $(LDFLAGS) -o $@ $^ $(LIBS) \ - `pkg-config --libs gtk+-3.0 gthread-2.0` - -gtkscrolledview.o: gtkscrolledview.c gtkscrolledview.h - echo "(compile-shim)" | $(exe) -- `pkg-config --cflags gtk+-3.0` -c $< - -gtkpanedview.o: gtkpanedview.c gtkpanedview.h - echo "(compile-shim)" | $(exe) -- `pkg-config --cflags gtk+-3.0` -c $< - -scmwidget.o: scmwidget.c scmwidget.h - echo "(compile-shim)" | $(exe) -- `pkg-config --cflags gtk+-3.0` -c $< - -gtkio.o: gtkio.c - echo "(compile-shim)" | $(exe) -- `pkg-config --cflags gtk+-3.0` -c $< - -gtk-shim.o: gtk-shim.c gtk-shim.h - echo "(compile-shim)" | $(exe) -- $(CPPFLAGS) $(CFLAGS) \ - `pkg-config --cflags gtk+-3.0` -c $< - -gtk-shim.c gtk-const.c gtk-types.bin: gtk-shim.h gtk.cdecl Includes/*.cdecl - echo '(generate-shim "gtk" "#include \"gtk-shim.h\"")' | $(exe) - -gtk-const.bin: gtk-const.scm - echo '(sf "gtk-const")' | $(exe) - -gtk-const.scm: gtk-const - ./gtk-const - -gtk-const: gtk-const.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) `pkg-config --libs gtk+-3.0` - -gtk-const.o: gtk-const.c gtk-shim.h - $(CC) $(CPPFLAGS) `pkg-config --cflags gtk+-3.0` $(CFLAGS) -c $< diff --git a/src/gtk/NEWS b/src/gtk/NEWS new file mode 100644 index 000000000..a8e83206a --- /dev/null +++ b/src/gtk/NEWS @@ -0,0 +1,26 @@ +mit-scheme-gtk NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz + +This file is part of a gtk plugin for MIT/GNU Scheme. + +This plugin 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 plugin 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 plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +mit-scheme-gtk 0.5 - Matt Birkholz, 2016-03-13 +============================================== + +* Use libtool and automake, rather than the microcode's disappearing + module support. diff --git a/src/gtk/README b/src/gtk/README index bdf98c2ca..55b570343 100644 --- a/src/gtk/README +++ b/src/gtk/README @@ -1,6 +1,8 @@ -The Gtk+ wrapper. +-*-Text-*- -The good news first: this wrapper provides specialized Gtk+ widget +The GNOME toolkits plugin. + +The good news first: this plugin provides specialized Gtk+ widget types that inherit the gesture and kinetic scrolling support in GtkScrolledWindow. Thus a Scheme canvas can be scrolled like any other widget. @@ -26,15 +28,19 @@ Unfortunately, implementing both GtkScrolledWindow and GtkScrolledView without duplicating a lot of code makes this a less-than-simple extension of Gtk+. -To build: +To build and install: ./configure - make all check install + make all check + make install install-html + +To use: + + (load-option 'GTK) + (make-fix-layout-demo) + +To import into a CREF package set (.pkg file): -The install target copies a shared library shim and compiled Scheme -files into the system library path, and re-writes the optiondb.scm -found there. You can override the default command name "mit-scheme" -(and thus the system library path) by setting MIT_SCHEME_EXE. + (global-definitions gtk/) -To use: (load-option 'GTK) and import the bindings you want. Only a -few bindings are exported to the global environment. +For more information see the accompanying user / reference manual. diff --git a/src/gtk/autogen.sh b/src/gtk/autogen.sh index 6263f54df..8af4031c7 100755 --- a/src/gtk/autogen.sh +++ b/src/gtk/autogen.sh @@ -1,19 +1,6 @@ #!/bin/sh -# Run this to generate all the initial makefiles, etc. -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd "$srcdir" - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" - exit 1 -fi - -autoreconf --force --install --verbose || exit $? - -cd "$olddir" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" +set -e +rm -rf m4 +mkdir m4 +autoreconf --force --install -I m4 diff --git a/src/gtk/check-doc.scm b/src/gtk/check-doc.scm deleted file mode 100644 index 1f2786fc8..000000000 --- a/src/gtk/check-doc.scm +++ /dev/null @@ -1,116 +0,0 @@ -#| -*-Scheme-*- - - Check that every binding in (gtk) or exported to () has a - corresponding @deffn in gtk.texinfo. |# - -(load-option 'cref) -(define read-package-model) -(define pmodel/packages) -(define package/name) -(define package/bindings) -(define package/links) -(define link/source) -(define link/destination) -(define binding/package) -(define binding/name) -(let ((cref (->environment '(cross-reference)))) - (set! read-package-model (access read-package-model cref)) - (set! pmodel/packages (access pmodel/packages cref)) - (set! package/name (access package/name cref)) - (set! package/bindings (access package/bindings cref)) - (set! package/links (access package/links cref)) - (set! link/source (access link/source cref)) - (set! link/destination (access link/destination cref)) - (set! binding/package (access binding/package cref)) - (set! binding/name (access binding/name cref))) - -(define (deffn-name line) - (let ((regs (re-string-match - (string-append "@deffnx?" - " \\(Class\\|Procedure\\|{Generic Procedure}\\)" - " \\([-A-Za-z0-9<>?!+./:]+\\)") - line))) - (if regs - (intern (re-match-extract line regs 2)) - (error "Could not find binding name:" line)))) - -(define (texinfo-deffns lines) - (let ((len (vector-length lines))) - (let loop ((i 0) (deffns '())) - (if (fix:< i len) - (let ((line (vector-ref lines i))) - (loop (fix:1+ i) - (if (string-prefix? "@deffn" line) - (cons (deffn-name line) deffns) - deffns))) - deffns)))) - -(define (read-lines port) - (let loop () - (let ((line (read-line port))) - (if (eof-object? line) - '() - (cons line (loop)))))) - -(define (pmodel/find-package pmodel package-name) - (find-matching-item (pmodel/packages pmodel) - (lambda (p) (equal? package-name (package/name p))))) - -(define (pmodel/global-exports pmodel) - (define (global-exports package) - (append-map! (lambda (link) - (if (eq? '() (package/name - (binding/package - (link/destination link)))) - (list (binding/name (link/destination link))) - '())) - (package/links package))) - (append-map! global-exports (pmodel/packages pmodel))) - -(define (pmodel/package-bindings pmodel package-name) - (let ((package (pmodel/find-package pmodel package-name))) - (if package - (map binding/name (package/bindings package)) - (error "No such package:" package-name)))) - -(define (duplicates listset) - (let loop ((items listset) (duplicates '())) - (cond ((null? items) - (reverse! duplicates)) - ((memq (car items) (cdr items)) - (if (memq (car items) duplicates) - (loop (cdr items) duplicates) - (loop (cdr items) (cons (car items) duplicates)))) - (else - (loop (cdr items) duplicates))))) - -(define (minus set1 set2) - (let loop ((items set1) (difference '())) - (cond ((null? items) - difference) - ((memq (car items) set2) - (loop (cdr items) difference)) - (else - (loop (cdr items) (cons (car items) difference)))))) - -(define (check) - (let* ((texinfo (list->vector (call-with-input-file "gtk.texinfo" - read-lines))) - (deffns (texinfo-deffns texinfo)) - (dups (duplicates deffns)) - (pmodel (read-package-model "gtk" microcode-id/operating-system)) - (bindings (append (pmodel/global-exports pmodel) - (pmodel/package-bindings pmodel '(gtk)))) - (missing (minus (minus bindings deffns) - '(make-pole-zero - make-fix-layout-demo - make-gtk-event-viewer-demo))) - (extras (minus deffns bindings))) - (if (not (null? dups)) - (for-each (lambda (name) (warn "multiple-descriptions:" name)) dups)) - (if (not (null? extras)) - (for-each (lambda (name) (warn "not bound:" name)) extras)) - (if (not (null? missing)) - (for-each (lambda (name) (warn "not documented:" name)) missing)))) - -(check) \ No newline at end of file diff --git a/src/gtk/check-doc.sh b/src/gtk/check-doc.sh new file mode 100755 index 000000000..0755fa4ef --- /dev/null +++ b/src/gtk/check-doc.sh @@ -0,0 +1,147 @@ +#!/bin/bash +# -*-Scheme-*- +# +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +# 2016 Matthew Birkholz +# +# This file is part of a gtk plugin for MIT/GNU Scheme. +# +# This plugin 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 plugin 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 plugin; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Check the documentation. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --batch-mode <<\EOF + +(let ((pkgset "gtk") + (texi "mit-scheme-gtk.texi") + (pkg '(gtk))) + ;; Check that every binding exported to () or PKG has a + ;; corresponding @deffn in TEXI. + + (parameterize ((param:suppress-loading-message? #t)) + (load-option 'CREF)) + (define read-package-model) + (define pmodel/packages) + (define package/name) + (define package/bindings) + (define package/links) + (define link/source) + (define link/destination) + (define binding/package) + (define binding/name) + (let ((cref (->environment '(cross-reference)))) + (set! read-package-model (access read-package-model cref)) + (set! pmodel/packages (access pmodel/packages cref)) + (set! package/name (access package/name cref)) + (set! package/bindings (access package/bindings cref)) + (set! package/links (access package/links cref)) + (set! link/source (access link/source cref)) + (set! link/destination (access link/destination cref)) + (set! binding/package (access binding/package cref)) + (set! binding/name (access binding/name cref))) + + (define (deffn-name line) + (let ((regs (re-string-match + (string-append "@deffnx?" + " \\(Class\\|Procedure\\|{Generic Procedure}\\)" + " \\([-A-Za-z0-9<>?!+./:]+\\)") + line))) + (if regs + (intern (re-match-extract line regs 2)) + (error "Could not find binding name:" line)))) + + (define (texinfo-deffns lines) + (let ((len (vector-length lines))) + (let loop ((i 0) (deffns '())) + (if (fix:< i len) + (let ((line (vector-ref lines i))) + (loop (fix:1+ i) + (if (string-prefix? "@deffn" line) + (cons (deffn-name line) deffns) + deffns))) + deffns)))) + + (define (read-lines port) + (let loop () + (let ((line (read-line port))) + (if (eof-object? line) + '() + (cons line (loop)))))) + + (define (pmodel/find-package pmodel package-name) + (find-matching-item (pmodel/packages pmodel) + (lambda (p) (equal? package-name (package/name p))))) + + (define (pmodel/global-exports pmodel) + (define (global-exports package) + (append-map! (lambda (link) + (if (eq? '() (package/name + (binding/package + (link/destination link)))) + (list (binding/name (link/destination link))) + '())) + (package/links package))) + (append-map! global-exports (pmodel/packages pmodel))) + + (define (pmodel/package-bindings pmodel package-name) + (let ((package (pmodel/find-package pmodel package-name))) + (if package + (map binding/name (package/bindings package)) + (error "No such package:" package-name)))) + + (define (duplicates listset) + (let loop ((items listset) (duplicates '())) + (cond ((null? items) + (reverse! duplicates)) + ((memq (car items) (cdr items)) + (if (memq (car items) duplicates) + (loop (cdr items) duplicates) + (loop (cdr items) (cons (car items) duplicates)))) + (else + (loop (cdr items) duplicates))))) + + (define (minus set1 set2) + (let loop ((items set1) (difference '())) + (cond ((null? items) + difference) + ((memq (car items) set2) + (loop (cdr items) difference)) + (else + (loop (cdr items) (cons (car items) difference)))))) + + (define (check) + (let* ((texinfo (list->vector (call-with-input-file texi read-lines))) + (deffns (texinfo-deffns texinfo)) + (dups (duplicates deffns)) + (pmodel (read-package-model pkgset microcode-id/operating-system)) + (bindings (append (pmodel/global-exports pmodel) + (if (null? pkg) + '() + (pmodel/package-bindings pmodel pkg)))) + (missing (minus bindings deffns)) + (extras (minus deffns bindings))) + (if (not (null? dups)) + (for-each (lambda (name) (warn "multiple-descriptions:" name)) dups)) + (if (not (null? extras)) + (for-each (lambda (name) (warn "not bound:" name)) extras)) + (if (not (null? missing)) + (for-each (lambda (name) (warn "not documented:" name)) missing)))) + + (check) + ) +EOF diff --git a/src/gtk/check.scm b/src/gtk/check.scm deleted file mode 100644 index ebf89c32d..000000000 --- a/src/gtk/check.scm +++ /dev/null @@ -1,14 +0,0 @@ -#| -*-Scheme-*- |# - -;;;; Test the gtk wrapper. - -(let ((dirname (directory-pathname (current-load-pathname))) - (param (access library-directory-path - (->environment '(runtime pathname))))) - (parameterize ((param (cons dirname (param)))) - (set! *initial-options-file* (merge-pathnames "gtk-optiondb" dirname)) - (load-option 'GTK))) - -(if (gtk-initialized?) - (load "gtk-check" (->environment '(GTK))) - (warn "Could not test the GTK subsystem without a DISPLAY.")) \ No newline at end of file diff --git a/src/gtk/compile.scm b/src/gtk/compile.scm deleted file mode 100644 index 9dc163018..000000000 --- a/src/gtk/compile.scm +++ /dev/null @@ -1,66 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Matthew Birkholz - -This file is part of an extension to MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; Compile the GTK wrapper. - -(load-option 'CREF) -(load-option 'CAIRO) -(load-option 'FFI) -(with-working-directory-pathname (directory-pathname (current-load-pathname)) - (lambda () - (with-system-library-directories - '("./") - (lambda () - (if (name->package '(GTK)) - (error "The GTK package already exists.") - (let ((package-set (package-set-pathname "gtk"))) - (if (not (file-modification-timeenvironment '(gtk))) - ;; Mostly to set! c-includes: - (load "gtk" (->environment '(gtk))) - - ;; The wrappers use the FFI, c-includes, and some integrable - ;; definitions in gtk.scm. Dependencies between them are - ;; rare. - (compile-file "gdk" '("gtk") (->environment '(gtk gdk))) - (compile-file "gtk-widget" '("gtk") (->environment '(gtk gtk-widget))) - (compile-file "scm-widget" '("gtk") (->environment '(gtk widget))) - (compile-file "fix-layout" '("gtk") (->environment '(gtk fix-layout))) - (compile-file "keys" '("gtk") (->environment '(gtk keys))) - (compile-file "main" '("gtk") (->environment '(gtk main))) - (compile-file "gtk-ev" '("gtk") (->environment '(gtk event-viewer))) - - ;; Users of the toolkit interface do NOT use the FFI directly, - ;; and do not need integrable definitions. - (compile-file "gtk-graphics" '("gtk") - (->environment '(runtime gtk-graphics))) - (compile-file "fix-demo" '() (->environment '(gtk fix-layout demo))) - (compile-file "swat" '() (->environment '(gtk swat))) - (compile-file "swat-pole-zero" '() (->environment '(swat))) - - (cref/generate-constructors "gtk" 'ALL))))) \ No newline at end of file diff --git a/src/gtk/compile.sh b/src/gtk/compile.sh new file mode 100755 index 000000000..6cd1e50ab --- /dev/null +++ b/src/gtk/compile.sh @@ -0,0 +1,73 @@ +#!/bin/sh +# -*-Scheme-*- +# +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +# 2016 Matthew Birkholz +# +# This file is part of a gtk plugin for MIT/GNU Scheme. +# +# This plugin 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 plugin 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 plugin; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Compile the GTK option. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --prepend-library . --batch-mode <<\EOF +(begin + + (parameterize ((param:suppress-loading-message? #t)) + (load-option 'CREF) + (load-option 'CAIRO) + (load-option 'FFI)) + + (if (name->package '(GTK)) + (error "The GTK package already exists.")) + (let ((package-set (package-set-pathname "gtk"))) + (if (not (file-modification-timeenvironment '(gtk))) + ;; Mostly to set! c-includes: + (load "gtk" (->environment '(gtk))) + + ;; The wrappers use the FFI, c-includes, and some integrable + ;; definitions in gtk.scm. Dependencies between them are + ;; rare. + (compile-file "gdk" '("gtk") (->environment '(gtk gdk))) + (compile-file "gtk-widget" '("gtk") (->environment '(gtk gtk-widget))) + (compile-file "scm-widget" '("gtk") (->environment '(gtk widget))) + (compile-file "fix-layout" '("gtk") (->environment '(gtk fix-layout))) + (compile-file "keys" '("gtk") (->environment '(gtk keys))) + (compile-file "main" '("gtk") (->environment '(gtk main))) + (compile-file "gtk-ev" '("gtk") (->environment '(gtk event-viewer))) + + ;; Users of the toolkit interface do NOT use the FFI directly, + ;; and do not need integrable definitions. + (compile-file "gtk-graphics" '("gtk") (->environment '(runtime gtk-graphics))) + (compile-file "fix-demo" '() (->environment '(gtk fix-layout demo))) + (compile-file "swat" '() (->environment '(gtk swat))) + (compile-file "swat-pole-zero" '() (->environment '(swat))) + + (cref/generate-constructors "gtk") + ) +EOF +SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` +REPORT=gtk-$SUFFIX.crf +if [ -s "$REPORT" ]; then echo "$REPORT:1: error: not empty"; exit 1; fi diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac index a036fe6af..79aa8a1ac 100644 --- a/src/gtk/configure.ac +++ b/src/gtk/configure.ac @@ -1,57 +1,67 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([MIT/GNU Scheme gtk plugin], [0.2], [matt@birchwood-abbey.net], [mit-scheme-gtk]) +AC_PREREQ([2.69]) +AC_INIT([MIT/GNU Scheme gtk plugin], + [0.5], + [puck@birchwood-abbey.net], + [mit-scheme-gtk]) AC_CONFIG_SRCDIR([gtk.pkg]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 2013, 2015 Matthew Birkholz +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of a plugin for MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. ]) AH_TOP([/* -Copyright (C) 2013, 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of a plugin for MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */]) -AC_ARG_WITH([gtk-version], - AS_HELP_STRING([--with-gtk-version], - [Use widgets specialized for the given Gtk+ version [[guess]]])) -: ${with_gtk_version='guess'} +AM_INIT_AUTOMAKE + +AC_PROG_LIBTOOL +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL + +dnl Initialize libtool +LT_PREREQ([2.2.6]) +LT_INIT([dlopen win32-dll]) AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes]) @@ -59,6 +69,11 @@ if ! pkg-config --exists gtk+-3.0 2>/dev/null; then AC_MSG_ERROR([Gtk 3.0 not found.]) fi +AC_ARG_WITH([gtk-version], + AS_HELP_STRING([--with-gtk-version], + [Use widgets specialized for the given Gtk+ version [[guess]]])) +: ${with_gtk_version='guess'} + if test "${with_gtk_version}" != guess; then GTK_VERSION=$with_gtk_version elif pkg-config --exists 'gtk+-3.0 >= 3.16.7' 2>/dev/null; then @@ -76,9 +91,14 @@ fi ln -sf gtkscrolledview-$GTK_VERSION.c gtkscrolledview.c ln -sf gtkpanedview-$GTK_VERSION.c gtkpanedview.c -AC_SUBST([CFLAGS]) -AC_SUBST([CPPFLAGS]) -AC_SUBST([LDFLAGS]) -AC_SUBST([LIBS]) +: ${MIT_SCHEME_EXE=mit-scheme} +MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \ + | ${MIT_SCHEME_EXE} --batch-mode` +MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` + +AC_SUBST([MIT_SCHEME_EXE]) +AC_SUBST([MIT_SCHEME_ARCH]) +AC_SUBST([MIT_SCHEME_OS_SUFFIX]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/src/gtk/fix-demo.scm b/src/gtk/fix-demo.scm index 999f243a5..766bc0116 100644 --- a/src/gtk/fix-demo.scm +++ b/src/gtk/fix-demo.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/fix-layout.scm b/src/gtk/fix-layout.scm index 9c4c22a78..e3babca5b 100644 --- a/src/gtk/fix-layout.scm +++ b/src/gtk/fix-layout.scm @@ -1,28 +1,27 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Matthew -Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# -;;;; : A fixnum-centric canvas. +;;;; A fixnum-centric canvas. ;;; package: (gtk fix-layout) ;;; is the base class that handles the realization of a diff --git a/src/gtk/gdk.scm b/src/gtk/gdk.scm index be96a3aba..4f8c92f4e 100644 --- a/src/gtk/gdk.scm +++ b/src/gtk/gdk.scm @@ -1,27 +1,27 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# -;;; GDK objects, procedures. +;;;; GDK Objects ;;; package: (gdk) (define (gdk-cairo-create gdkwindow) diff --git a/src/gtk/gtk-check.scm b/src/gtk/gtk-check.scm deleted file mode 100644 index 67099f284..000000000 --- a/src/gtk/gtk-check.scm +++ /dev/null @@ -1,70 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 2012, 2013, 2014 Matthew Birkholz - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; Test the Gtks - -(let ((new (extend-top-level-environment (->environment '(gtk)))) - (ffi (->environment '(runtime ffi)))) - (load "gtk-tests" new) - (load "hello" new) - (let ((await-closed-demos (access await-closed-demos new)) - (registered-callback-count (access registered-callback-count ffi)) - (malloced-aliens (named-lambda (malloced-aliens) - (access malloced-aliens ffi)))) - - (define (run-test name thunk) - (let ((condition (ignore-errors thunk))) - (cond ((eq? condition #t) - (for-each display (list "; Test "name" succeeded.\n"))) - ((condition? condition) - (for-each display (list "; Test "name" failed with error:\n")) - (write-condition-report condition (current-output-port)) - (newline)) - (else - (for-each display (list "; Test "name" returned "condition - ".\n")))))) - - (define (assert = obj1 obj2 form) - (if (not (= obj1 obj2)) - (error "Assertion failed:" form)) - #t) - - (run-test - 'gtk-demos - (named-lambda (gtk-demos-test) - (with-gc-notification! #t await-closed-demos) - #t)) - - (gc-flip) - - (run-test - 'gtk-demos.callbacks - (named-lambda (gtk-demos.callbacks-test) - (assert = 0 (car (registered-callback-count)) - '(CAR (REGISTERED-CALLBACK-COUNT))))) - - (run-test - 'gtk-demos.mallocs - (named-lambda (gtk-demos.mallocs-test) - (assert = 0 (length (malloced-aliens)) - '(LENGTH (MALLOCED-ALIENS))))))) \ No newline at end of file diff --git a/src/gtk/gtk-check.sh b/src/gtk/gtk-check.sh new file mode 100755 index 000000000..a67f8b65d --- /dev/null +++ b/src/gtk/gtk-check.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# -*-Scheme-*- +# +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +# 2016 Matthew Birkholz +# +# This file is part of a gtk plugin for MIT/GNU Scheme. +# +# This plugin 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 plugin 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 plugin; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Test the GTK option. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --prepend-library . <<\EOF +(begin + (load-option 'GTK) + (let ((new (extend-top-level-environment (->environment '(GTK)))) + (ffi (->environment '(RUNTIME FFI)))) + (load "gtk-tests" new) + (if (gtk-initialized?) + (let ((await-closed-demos (access await-closed-demos new)) + (assert-clean-ffi (access assert-clean-ffi new))) + (load "hello" new) + (with-gc-notification! #t await-closed-demos) + (assert-clean-ffi "gtk")) + (warn "Could not test the GTK subsystem without a DISPLAY."))) + ) +EOF diff --git a/src/gtk/gtk-ev.scm b/src/gtk/gtk-ev.scm index 234afca1c..21b262e00 100644 --- a/src/gtk/gtk-ev.scm +++ b/src/gtk/gtk-ev.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2011, 2012, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/gtk-graphics.scm b/src/gtk/gtk-graphics.scm index 1c66cbb69..588d63cd2 100644 --- a/src/gtk/gtk-graphics.scm +++ b/src/gtk/gtk-graphics.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2013, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/gtk-shim.h b/src/gtk/gtk-shim.h index c80eb840d..2f0282a1c 100644 --- a/src/gtk/gtk-shim.h +++ b/src/gtk/gtk-shim.h @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtk-tests.scm b/src/gtk/gtk-tests.scm index faa38356f..e3c3c82e7 100644 --- a/src/gtk/gtk-tests.scm +++ b/src/gtk/gtk-tests.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2010, 2011, 2012, 2013, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# @@ -34,4 +34,19 @@ USA. (->environment '(gtk gtk-widget))))) (begin (sleep-current-thread 1000) - (loop))))) \ No newline at end of file + (loop))))) + +(define (assert-clean-ffi test-name) + (gc-flip) + (sleep-current-thread 100) ;Ensure GC deamons finish? + (let ((ffi (->environment '(runtime ffi)))) + (if (not (zero? (car ((access registered-callback-count ffi))))) + (error (string-append test-name" did not clean up its callbacks"))) + (if (not (null? (access malloced-aliens ffi))) + (error (string-append test-name" did not free allocated memory:") + (map (lambda (elt) + (let ((alien (weak-car elt))) + (if (eq? 'uchar (alien/ctype alien)) + (c-peek-cstring alien) + alien))) + (access malloced-aliens ffi)))))) \ No newline at end of file diff --git a/src/gtk/gtk-widget.scm b/src/gtk/gtk-widget.scm index ceaf50bf6..d9d8fefcc 100644 --- a/src/gtk/gtk-widget.scm +++ b/src/gtk/gtk-widget.scm @@ -1,24 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Matthew -Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/gtk.cdecl b/src/gtk/gtk.cdecl index 950804b05..0b45ff8b0 100644 --- a/src/gtk/gtk.cdecl +++ b/src/gtk/gtk.cdecl @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/gtk.pkg b/src/gtk/gtk.pkg index a6917e241..f465923ce 100644 --- a/src/gtk/gtk.pkg +++ b/src/gtk/gtk.pkg @@ -1,24 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Matthew -Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/gtk.scm b/src/gtk/gtk.scm index 91b144d8a..cabd15aae 100644 --- a/src/gtk/gtk.scm +++ b/src/gtk/gtk.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/gtkio.c b/src/gtk/gtkio.c index 1f0669f30..e045d1a1c 100644 --- a/src/gtk/gtkio.c +++ b/src/gtk/gtkio.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkpanedview-3.10.8.c b/src/gtk/gtkpanedview-3.10.8.c index 8096a29c6..b9e6ad637 100644 --- a/src/gtk/gtkpanedview-3.10.8.c +++ b/src/gtk/gtkpanedview-3.10.8.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkpanedview-3.14.13.c b/src/gtk/gtkpanedview-3.14.13.c index ea330aa4e..7a76c985d 100644 --- a/src/gtk/gtkpanedview-3.14.13.c +++ b/src/gtk/gtkpanedview-3.14.13.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkpanedview-3.16.7.c b/src/gtk/gtkpanedview-3.16.7.c index c03e92580..ff4e871ed 100644 --- a/src/gtk/gtkpanedview-3.16.7.c +++ b/src/gtk/gtkpanedview-3.16.7.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkpanedview-3.6.0.c b/src/gtk/gtkpanedview-3.6.0.c index 9b6f04bda..99df112cd 100644 --- a/src/gtk/gtkpanedview-3.6.0.c +++ b/src/gtk/gtkpanedview-3.6.0.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2013 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkpanedview-new.c b/src/gtk/gtkpanedview-new.c new file mode 100644 index 000000000..c75c9c7a8 --- /dev/null +++ b/src/gtk/gtkpanedview-new.c @@ -0,0 +1,701 @@ +/* -*-C-*- + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz + +This file is part of a gtk plugin for MIT/GNU Scheme. + +This plugin 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 plugin 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 plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +/* A specialized GtkPaned. See documentation of . */ + +#include "gtkpanedview.h" + +static void gtk_paned_view_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size); +static void gtk_paned_view_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size); +static void gtk_paned_view_get_preferred_height_for_width + (GtkWidget *layout, + gint width, + gint *minimum_height, + gint *natural_height); +static void gtk_paned_view_get_preferred_width_for_height + (GtkWidget *layout, + gint width, + gint *minimum_height, + gint *natural_height); + +static void gtk_paned_view_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + +G_DEFINE_TYPE (GtkPanedView, gtk_paned_view, + GTK_TYPE_PANED) + +static void +gtk_paned_view_class_init (GtkPanedViewClass *class) +{ + GtkWidgetClass *widget_class = (GtkWidgetClass*) class; + + widget_class->get_preferred_width = gtk_paned_view_get_preferred_width; + widget_class->get_preferred_height = gtk_paned_view_get_preferred_height; + widget_class->get_preferred_height_for_width = gtk_paned_view_get_preferred_height_for_width; + widget_class->get_preferred_width_for_height = gtk_paned_view_get_preferred_width_for_height; + widget_class->size_allocate = gtk_paned_view_size_allocate; +} + +static void +gtk_paned_view_init (GtkPanedView *paned_view) +{ + g_assert (GTK_PANED (paned_view) ->priv != NULL); +} + +/** + * gtk_paned_view_new: + * @orientation: GTK_ORIENTATION_VERTICAL or GTK_ORIENTATION_HORIZONTAL. + * + * Creates a new paned view. + * + * Returns: a new paned view. + */ +GtkWidget* +gtk_paned_view_new (GtkOrientation orientation) +{ + return (g_object_new (GTK_TYPE_PANED_VIEW, + "orientation", orientation, + NULL)); +} + +/* The rest of this file was copied from gtkpaned.c v3.6.0 with + minimal modification. */ + +enum { + CHILD1, + CHILD2 +}; + +typedef struct _GtkCssNode GtkCssNode; + +struct _GtkPanedPrivate +{ + GtkPaned *first_paned; + GtkWidget *child1; + GtkWidget *child2; + GdkWindow *child1_window; + GdkWindow *child2_window; + GtkWidget *last_child1_focus; + GtkWidget *last_child2_focus; + GtkWidget *saved_focus; + GtkOrientation orientation; + + GdkRectangle handle_pos; + GdkWindow *handle; + GtkCssNode *handle_node; + + GtkGesture *pan_gesture; + + gint child1_size; + gint drag_pos; + gint last_allocation; + gint max_position; + gint min_position; + gint original_position; + + guint handle_prelit : 1; + guint in_recursion : 1; + guint child1_resize : 1; + guint child1_shrink : 1; + guint child2_resize : 1; + guint child2_shrink : 1; + guint position_set : 1; + guint panning : 1; +}; + +static void +flip_child (GtkWidget *widget, + GtkAllocation *child_pos) +{ + GtkAllocation allocation; + gint x, width; + + gtk_widget_get_allocation (widget, &allocation); + x = allocation.x; + width = allocation.width; + + child_pos->x = 2 * x + width - child_pos->x - child_pos->width; +} + +static void +gtk_paned_set_child_visible (GtkPaned *paned, + guint id, + gboolean visible) +{ + GtkPanedPrivate *priv = paned->priv; + GtkWidget *child; + + child = id == CHILD1 ? priv->child1 : priv->child2; + + if (child == NULL) + return; + + gtk_widget_set_child_visible (child, visible); + + if (gtk_widget_get_mapped (GTK_WIDGET (paned))) + { + GdkWindow *window = id == CHILD1 ? priv->child1_window : priv->child2_window; + + if (visible != gdk_window_is_visible (window)) + { + if (visible) + gdk_window_show (window); + else + gdk_window_hide (window); + } + } +} + +static void +gtk_paned_child_allocate (GtkWidget *child, + GdkWindow *child_window, /* can be NULL */ + const GtkAllocation *window_allocation, + GtkAllocation *child_allocation) +{ + if (child_window) + gdk_window_move_resize (child_window, + window_allocation->x, window_allocation->y, + window_allocation->width, window_allocation->height); + + gtk_widget_size_allocate (child, child_allocation); +} + +static void +gtk_paned_compute_position (GtkPaned *paned, + gint allocation, + gint child1_min, + gint child1_nat, + gint child2_min, + gint child2_nat, + gint *min_pos, + gint *max_pos, + gint *out_pos) +{ + GtkPanedPrivate *priv = paned->priv; + gint min, max, pos; + + min = priv->child1_shrink ? 0 : child1_min; + + max = allocation; + if (!priv->child2_shrink) + max = MAX (1, max - child2_min); + max = MAX (min, max); + + if (!priv->position_set) + { + if (priv->child1_resize && !priv->child2_resize) + pos = MAX (0, allocation - child2_nat); + else if (!priv->child1_resize && priv->child2_resize) + pos = child1_nat; + else if (child1_nat + child2_nat != 0) + pos = allocation * ((gdouble)child1_nat / (child1_nat + child2_nat)) + 0.5; + else + pos = allocation * 0.5 + 0.5; + } + else + { + /* If the position was set before the initial allocation. + * (priv->last_allocation <= 0) just clamp it and leave it. + */ + if (priv->last_allocation > 0) + { + if (priv->child1_resize && !priv->child2_resize) + pos = priv->child1_size + allocation - priv->last_allocation; + else if (!(!priv->child1_resize && priv->child2_resize)) + pos = allocation * ((gdouble) priv->child1_size / (priv->last_allocation)) + 0.5; + else + pos = priv->child1_size; + } + else + pos = priv->child1_size; + } + + pos = CLAMP (pos, min, max); + + if (min_pos) + *min_pos = min; + if (max_pos) + *max_pos = max; + if (out_pos) + *out_pos = pos; +} + +static void +gtk_paned_calc_position (GtkPaned *paned, + gint allocation, + gint child1_min, + gint child1_nat, + gint child2_min, + gint child2_nat) +{ + GtkPanedPrivate *priv = paned->priv; + gint old_position; + gint old_min_position; + gint old_max_position; + + old_position = priv->child1_size; + old_min_position = priv->min_position; + old_max_position = priv->max_position; + + gtk_paned_compute_position (paned, + allocation, child1_min, child1_nat, child2_min, child2_nat, + &priv->min_position, &priv->max_position, + &priv->child1_size); + + gtk_paned_set_child_visible (paned, CHILD1, priv->child1_size != 0); + gtk_paned_set_child_visible (paned, CHILD2, priv->child1_size != allocation); + + g_object_freeze_notify (G_OBJECT (paned)); + if (priv->child1_size != old_position) + g_object_notify (G_OBJECT (paned), "position"); + if (priv->min_position != old_min_position) + g_object_notify (G_OBJECT (paned), "min-position"); + if (priv->max_position != old_max_position) + g_object_notify (G_OBJECT (paned), "max-position"); + g_object_thaw_notify (G_OBJECT (paned)); + + priv->last_allocation = allocation; +} + +static void +gtk_paned_view_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GtkPaned *paned = GTK_PANED (widget); + GtkPanedPrivate *priv = paned->priv; + + gtk_widget_set_allocation (widget, allocation); + + if (priv->child1 && gtk_widget_get_visible (priv->child1) && + priv->child2 && gtk_widget_get_visible (priv->child2)) + { + GtkAllocation child1_allocation, window1_allocation; + GtkAllocation child2_allocation, window2_allocation; + GtkAllocation priv_child1_allocation; + GdkRectangle old_handle_pos; + gint handle_size; + + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); + + old_handle_pos = priv->handle_pos; + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + gint child1_min_width, child1_nat_width; + gint child2_min_width, child2_nat_width; + + gtk_widget_get_preferred_width_for_height (priv->child1, + allocation->height, + &child1_min_width, &child1_nat_width); + gtk_widget_get_preferred_width_for_height (priv->child2, + allocation->height, + &child2_min_width, &child2_nat_width); + + gtk_paned_calc_position (paned, + MAX (1, allocation->width - handle_size), + child1_min_width, child1_nat_width, + child2_min_width, child2_nat_width); + + priv->handle_pos.x = allocation->x + priv->child1_size; + priv->handle_pos.y = allocation->y; + priv->handle_pos.width = handle_size; + priv->handle_pos.height = allocation->height; + + window1_allocation.height = window2_allocation.height = allocation->height; + window1_allocation.width = MAX (1, priv->child1_size); + window1_allocation.x = allocation->x; + window1_allocation.y = window2_allocation.y = allocation->y; + + window2_allocation.x = window1_allocation.x + priv->child1_size + priv->handle_pos.width; + window2_allocation.width = MAX (1, allocation->x + allocation->width - window2_allocation.x); + + if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL) + { + flip_child (widget, &(window2_allocation)); + flip_child (widget, &(window1_allocation)); + flip_child (widget, &(priv->handle_pos)); + } + + child1_allocation.x = child1_allocation.y = 0; + child1_allocation.width = window1_allocation.width; + child1_allocation.height = window1_allocation.height; + if (child1_min_width > child1_allocation.width) + { + if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_LTR) + child1_allocation.x -= child1_min_width - child1_allocation.width; + child1_allocation.width = child1_min_width; + } + + child2_allocation.x = child2_allocation.y = 0; + child2_allocation.width = window2_allocation.width; + child2_allocation.height = window2_allocation.height; + if (child2_min_width > child2_allocation.width) + { + if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL) + child2_allocation.x -= child2_min_width - child2_allocation.width; + child2_allocation.width = child2_min_width; + } + } + else + { + gint child1_min_height, child1_nat_height; + gint child2_min_height, child2_nat_height; + + gtk_widget_get_preferred_height_for_width (priv->child1, + allocation->width, + &child1_min_height, + &child1_nat_height); + gtk_widget_get_preferred_height_for_width (priv->child2, + allocation->width, + &child2_min_height, + &child2_nat_height); + + gtk_paned_calc_position (paned, + MAX (1, allocation->height - handle_size), + child1_min_height, child1_nat_height, + child2_min_height, child2_nat_height); + + priv->handle_pos.x = allocation->x; + priv->handle_pos.y = allocation->y + priv->child1_size; + priv->handle_pos.width = allocation->width; + priv->handle_pos.height = handle_size; + + window1_allocation.width = window2_allocation.width = allocation->width; + window1_allocation.height = MAX (1, priv->child1_size); + window1_allocation.x = window2_allocation.x = allocation->x; + window1_allocation.y = allocation->y; + + window2_allocation.y = window1_allocation.y + priv->child1_size + priv->handle_pos.height; + window2_allocation.height = MAX (1, allocation->y + allocation->height - window2_allocation.y); + + child1_allocation.x = child1_allocation.y = 0; + child1_allocation.width = window1_allocation.width; + child1_allocation.height = window1_allocation.height; + if (child1_min_height > child1_allocation.height) + { + child1_allocation.y -= child1_min_height - child1_allocation.height; + child1_allocation.height = child1_min_height; + } + + child2_allocation.x = child2_allocation.y = 0; + child2_allocation.width = window2_allocation.width; + child2_allocation.height = window2_allocation.height; + if (child2_min_height > child2_allocation.height) + child2_allocation.height = child2_min_height; + } + + if (gtk_widget_get_mapped (widget) && + (old_handle_pos.x != priv->handle_pos.x || + old_handle_pos.y != priv->handle_pos.y || + old_handle_pos.width != priv->handle_pos.width || + old_handle_pos.height != priv->handle_pos.height)) + { + GdkWindow *window; + + window = gtk_widget_get_window (widget); + gdk_window_invalidate_rect (window, &old_handle_pos, FALSE); + gdk_window_invalidate_rect (window, &priv->handle_pos, FALSE); + } + + if (gtk_widget_get_realized (widget)) + { + GtkBorder margin; + GtkStyleContext *context = gtk_widget_get_style_context (widget); + + gtk_style_context_get_margin (context, + gtk_style_context_get_state (context), + &margin); + + if (gtk_widget_get_mapped (widget)) + gdk_window_show (priv->handle); + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + gdk_window_move_resize (priv->handle, + priv->handle_pos.x - margin.left, + priv->handle_pos.y, + handle_size + margin.left + margin.right, + priv->handle_pos.height); + } + else + { + gdk_window_move_resize (priv->handle, + priv->handle_pos.x, + priv->handle_pos.y - margin.top, + priv->handle_pos.width, + handle_size + margin.top + margin.bottom); + } + } + + /* Now allocate the childen, making sure, when resizing not to + * overlap the windows + */ + gtk_widget_get_allocation (priv->child1, &priv_child1_allocation); + if (gtk_widget_get_mapped (widget) && + ((priv->orientation == GTK_ORIENTATION_HORIZONTAL && + priv_child1_allocation.width < child1_allocation.width) || + + (priv->orientation == GTK_ORIENTATION_VERTICAL && + priv_child1_allocation.height < child1_allocation.height))) + { + gtk_paned_child_allocate (priv->child2, + priv->child2_window, + &window2_allocation, + &child2_allocation); + gtk_paned_child_allocate (priv->child1, + priv->child1_window, + &window1_allocation, + &child1_allocation); + } + else + { + gtk_paned_child_allocate (priv->child1, + priv->child1_window, + &window1_allocation, + &child1_allocation); + gtk_paned_child_allocate (priv->child2, + priv->child2_window, + &window2_allocation, + &child2_allocation); + } + } + else + { + GtkAllocation window_allocation, child_allocation; + + if (gtk_widget_get_realized (widget)) + gdk_window_hide (priv->handle); + + window_allocation.x = allocation->x; + window_allocation.y = allocation->y; + window_allocation.width = allocation->width; + window_allocation.height = allocation->height; + child_allocation.x = child_allocation.y = 0; + child_allocation.width = allocation->width; + child_allocation.height = allocation->height; + + if (priv->child1 && gtk_widget_get_visible (priv->child1)) + { + gtk_paned_set_child_visible (paned, CHILD1, TRUE); + gtk_paned_set_child_visible (paned, CHILD2, FALSE); + + gtk_paned_child_allocate (priv->child1, + priv->child1_window, + &window_allocation, + &child_allocation); + } + else if (priv->child2 && gtk_widget_get_visible (priv->child2)) + { + gtk_paned_set_child_visible (paned, CHILD1, FALSE); + gtk_paned_set_child_visible (paned, CHILD2, TRUE); + + gtk_paned_child_allocate (priv->child2, + priv->child2_window, + &window_allocation, + &child_allocation); + } + else + { + gtk_paned_set_child_visible (paned, CHILD1, FALSE); + gtk_paned_set_child_visible (paned, CHILD2, FALSE); + } + } +} + +static void +get_preferred_size_for_size (GtkWidget *widget, + GtkOrientation orientation, + gint size, + gint *minimum, + gint *natural) +{ + if (orientation == GTK_ORIENTATION_HORIZONTAL) + if (size < 0) + gtk_widget_get_preferred_width (widget, minimum, natural); + else + gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural); + else + if (size < 0) + gtk_widget_get_preferred_height (widget, minimum, natural); + else + gtk_widget_get_preferred_height_for_width (widget, size, minimum, natural); +} + +static void +gtk_paned_get_preferred_size_for_orientation (GtkWidget *widget, + gint size, + gint *minimum, + gint *natural) +{ + GtkPaned *paned = GTK_PANED (widget); + GtkPanedPrivate *priv = paned->priv; + gint child_min, child_nat; + + *minimum = *natural = 0; + + if (priv->child1 && gtk_widget_get_visible (priv->child1)) + { + get_preferred_size_for_size (priv->child1, priv->orientation, size, &child_min, &child_nat); + if (priv->child1_shrink) + *minimum = 0; + else + *minimum = child_min; + *natural = child_nat; + } + + if (priv->child2 && gtk_widget_get_visible (priv->child2)) + { + get_preferred_size_for_size (priv->child2, priv->orientation, size, &child_min, &child_nat); + + if (!priv->child2_shrink) + *minimum += child_min; + *natural += child_nat; + } + + if (priv->child1 && gtk_widget_get_visible (priv->child1) && + priv->child2 && gtk_widget_get_visible (priv->child2)) + { + gint handle_size; + + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); + + *minimum += handle_size; + *natural += handle_size; + } +} + +#define OPPOSITE_ORIENTATION(_orientation) (1 - (_orientation)) + +static void +gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget *widget, + gint size, + gint *minimum, + gint *natural) +{ + GtkPaned *paned = GTK_PANED (widget); + GtkPanedPrivate *priv = paned->priv; + gint for_child1, for_child2; + gint child_min, child_nat; + + if (size > -1 && + priv->child1 && gtk_widget_get_visible (priv->child1) && + priv->child2 && gtk_widget_get_visible (priv->child2)) + { + gint child1_min, child1_nat, child2_min, child2_nat; + gint handle_size; + + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); + + get_preferred_size_for_size (priv->child1, priv->orientation, -1, &child1_min, &child1_nat); + get_preferred_size_for_size (priv->child2, priv->orientation, -1, &child2_min, &child2_nat); + + gtk_paned_compute_position (paned, + size - handle_size, child1_min, child1_nat, child2_min, child2_nat, + NULL, NULL, &for_child1); + + for_child2 = size - for_child1 - handle_size; + } + else + { + for_child1 = size; + for_child2 = size; + } + + *minimum = *natural = 0; + + if (priv->child1 && gtk_widget_get_visible (priv->child1)) + { + get_preferred_size_for_size (priv->child1, + OPPOSITE_ORIENTATION (priv->orientation), + for_child1, + &child_min, &child_nat); + + *minimum = child_min; + *natural = child_nat; + } + + if (priv->child2 && gtk_widget_get_visible (priv->child2)) + { + get_preferred_size_for_size (priv->child2, + OPPOSITE_ORIENTATION (priv->orientation), + for_child2, + &child_min, &child_nat); + + *minimum = MAX (*minimum, child_min); + *natural = MAX (*natural, child_nat); + } +} + +static void +gtk_paned_view_get_preferred_size (GtkWidget *widget, + GtkOrientation orientation, + gint size, + gint *minimum, + gint *natural) +{ + GtkPaned *paned = GTK_PANED (widget); + GtkPanedPrivate *priv = paned->priv; + + if (orientation == priv->orientation) + gtk_paned_get_preferred_size_for_orientation (widget, size, minimum, natural); + else + gtk_paned_get_preferred_size_for_opposite_orientation (widget, size, minimum, natural); +} + +static void +gtk_paned_view_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + gtk_paned_view_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum, natural); +} + +static void +gtk_paned_view_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + gtk_paned_view_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum, natural); +} + +static void +gtk_paned_view_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum, + gint *natural) +{ + gtk_paned_view_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, height, minimum, natural); +} + +static void +gtk_paned_view_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural) +{ + gtk_paned_view_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, width, minimum, natural); +} diff --git a/src/gtk/gtkpanedview.h b/src/gtk/gtkpanedview.h index 9370b4420..8dcd30593 100644 --- a/src/gtk/gtkpanedview.h +++ b/src/gtk/gtkpanedview.h @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2013 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkscrolledview-3.10.8.c b/src/gtk/gtkscrolledview-3.10.8.c index d86be57c6..e861832f4 100644 --- a/src/gtk/gtkscrolledview-3.10.8.c +++ b/src/gtk/gtkscrolledview-3.10.8.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2012, 2013, 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkscrolledview-3.14.13.c b/src/gtk/gtkscrolledview-3.14.13.c index 20c7eb450..5010b9a8f 100644 --- a/src/gtk/gtkscrolledview-3.14.13.c +++ b/src/gtk/gtkscrolledview-3.14.13.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2012, 2013, 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkscrolledview-3.16.7.c b/src/gtk/gtkscrolledview-3.16.7.c index 58b694a6d..fa46de496 100644 --- a/src/gtk/gtkscrolledview-3.16.7.c +++ b/src/gtk/gtkscrolledview-3.16.7.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2012, 2013, 2015 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkscrolledview-3.6.0.c b/src/gtk/gtkscrolledview-3.6.0.c index 54d718706..671ef7c57 100644 --- a/src/gtk/gtkscrolledview-3.6.0.c +++ b/src/gtk/gtkscrolledview-3.6.0.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2012, 2013 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/gtkscrolledview-new.c b/src/gtk/gtkscrolledview-new.c new file mode 100644 index 000000000..099e6c0da --- /dev/null +++ b/src/gtk/gtkscrolledview-new.c @@ -0,0 +1,306 @@ +/* -*-C-*- + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz + +This file is part of a gtk plugin for MIT/GNU Scheme. + +This plugin 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 plugin 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 plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +/* A specialized GtkScrolledWindow. + + A GtkScrolledWindow is used to squeeze an overly large widget into a + smaller space and allow the user to scroll it. The geometry + implementation ignores the natural size of the problem widget, + expecting @code{gtk_widget_set_size_request} to override its minimum + size. + + A GtkScrolledView is used to stick scrollbars on a viewport. Its + natural size is the natural size of the viewport, plus scrollbars, + frame, etc. Using @code{gtk_widget_set_size_request} is unnecessary + and interferes with resizing. + */ + +#include "gtkscrolledview.h" + +struct _GtkScrolledWindowPrivate +{ + GtkWidget *hscrollbar; + GtkWidget *vscrollbar; + + GtkCssNode *overshoot_node[4]; + GtkCssNode *undershoot_node[4]; + + Indicator hindicator; + Indicator vindicator; + + GtkCornerType window_placement; + guint16 shadow_type; + + guint hscrollbar_policy : 2; + guint vscrollbar_policy : 2; + guint hscrollbar_visible : 1; + guint vscrollbar_visible : 1; + guint focus_out : 1; /* used by ::move-focus-out implementation */ + guint overlay_scrolling : 1; + guint use_indicators : 1; + + gint min_content_width; + gint min_content_height; + + guint scroll_events_overshoot_id; + + /* Kinetic scrolling */ + GtkGesture *long_press_gesture; + GtkGesture *swipe_gesture; + + GArray *scroll_history; + GdkDevice *scroll_device; + + /* These two gestures are mutually exclusive */ + GtkGesture *drag_gesture; + GtkGesture *pan_gesture; + + gdouble drag_start_x; + gdouble drag_start_y; + + GdkDevice *drag_device; + guint kinetic_scrolling : 1; + guint capture_button_press : 1; + guint in_drag : 1; + + guint deceleration_id; + + gdouble x_velocity; + gdouble y_velocity; + + gdouble unclamped_hadj_value; + gdouble unclamped_vadj_value; +}; + +static void gtk_scrolled_view_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size); +static void gtk_scrolled_view_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size); +static void gtk_scrolled_view_get_preferred_height_for_width (GtkWidget *layout, + gint width, + gint *minimum_height, + gint *natural_height); +static void gtk_scrolled_view_get_preferred_width_for_height (GtkWidget *layout, + gint width, + gint *minimum_height, + gint *natural_height); + +G_DEFINE_TYPE (GtkScrolledView, gtk_scrolled_view, + GTK_TYPE_SCROLLED_WINDOW) + +static void +gtk_scrolled_view_class_init (GtkScrolledViewClass *class) +{ + GtkWidgetClass *widget_class = (GtkWidgetClass*) class; + + widget_class->get_preferred_width = gtk_scrolled_view_get_preferred_width; + widget_class->get_preferred_height = gtk_scrolled_view_get_preferred_height; + widget_class->get_preferred_height_for_width = gtk_scrolled_view_get_preferred_height_for_width; + widget_class->get_preferred_width_for_height = gtk_scrolled_view_get_preferred_width_for_height; +} + +static void +gtk_scrolled_view_init (GtkScrolledView *scrolled_view) +{ + g_assert (GTK_SCROLLED_WINDOW (scrolled_view) ->priv != NULL); +} + +/** + * gtk_scrolled_view_new: + * @hadjustment: (allow-none): horizontal adjustment + * @vadjustment: (allow-none): vertical adjustment + * + * Creates a new scrolling window. + * + * The two arguments are the scrolling window's adjustments; these will be + * shared with the scrollbars and the child widget to keep the bars in sync + * with the child. Usually you want to pass %NULL for the adjustments, which + * will cause the scrolling window to create them for you. + * + * Returns: a new scrolling window + */ +GtkWidget* +gtk_scrolled_view_new (GtkAdjustment *hadjustment, + GtkAdjustment *vadjustment) +{ + GtkWidget *scrolled_view; + + if (hadjustment) + g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadjustment), NULL); + + if (vadjustment) + g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadjustment), NULL); + + scrolled_view = g_object_new (GTK_TYPE_SCROLLED_VIEW, + "hadjustment", hadjustment, + "vadjustment", vadjustment, + NULL); + + return scrolled_view; +} + +static gint +gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window) +{ + GtkScrolledWindowClass *class; + + g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), 0); + + class = GTK_SCROLLED_WINDOW_GET_CLASS (scrolled_window); + + if (class->scrollbar_spacing >= 0) + return class->scrollbar_spacing; + else + { + gint scrollbar_spacing; + + gtk_widget_style_get (GTK_WIDGET (scrolled_window), + "scrollbar-spacing", &scrollbar_spacing, + NULL); + + return scrollbar_spacing; + } +} + +static void +gtk_scrolled_window_get_preferred_size (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum_size, + gint *natural_size) +{ + GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget); + GtkScrolledWindowPrivate *priv = scrolled_window->priv; + GtkBin *bin = GTK_BIN (scrolled_window); + gint extra_width; + gint extra_height; + gint minimum; + gint natural; + GtkWidget *child; + + /* Init to child size. */ + child = gtk_bin_get_child (bin); + if (child && gtk_widget_get_visible (child)) + { + if (orientation == GTK_ORIENTATION_HORIZONTAL) + gtk_widget_get_preferred_width (child, &minimum, &natural); + else + gtk_widget_get_preferred_height (child, &minimum, &natural); + } + + /* Add min_content_width/height. */ + { + gint min_content_size = (orientation == GTK_ORIENTATION_HORIZONTAL + ? priv->min_content_width + : priv->min_content_height); + if (min_content_size >= 0) + { + minimum = MAX (minimum, min_content_size); + natural = MAX (natural, min_content_size); + } + } + + /* Add scrollbar size. */ + if ((orientation == GTK_ORIENTATION_VERTICAL + && priv->hscrollbar_policy != GTK_POLICY_NEVER) || + (orientation == GTK_ORIENTATION_HORIZONTAL + && priv->vscrollbar_policy != GTK_POLICY_NEVER)) + { + gint min, nat; + gint space = gtk_scrolled_window_get_scrollbar_spacing (scrolled_window); + if (orientation == GTK_ORIENTATION_VERTICAL) + gtk_widget_get_preferred_height (priv->hscrollbar, &min, &nat); + else + gtk_widget_get_preferred_width (priv->vscrollbar, &min, &nat); + minimum += space + min; + natural += space + nat; + } + + /* Add shadow size. */ + if (priv->shadow_type != GTK_SHADOW_NONE) + { + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; + + context = gtk_widget_get_style_context (GTK_WIDGET (widget)); + state = gtk_widget_get_state_flags (GTK_WIDGET (widget)); + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME); + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); + gtk_style_context_restore (context); + + if (orientation == GTK_ORIENTATION_VERTICAL) + { + minimum += padding.top + padding.bottom + border.top + border.bottom; + natural += padding.top + padding.bottom + border.top + border.bottom; + } + else + { + minimum += padding.left + padding.right + border.left + border.right; + natural += padding.left + padding.right + border.left + border.right; + } + } + + if (minimum_size) + *minimum_size = minimum; + if (natural_size) + *natural_size = natural; +} + +static void +gtk_scrolled_view_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gtk_scrolled_view_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size); +} + +static void +gtk_scrolled_view_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gtk_scrolled_view_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size); +} + +static void +gtk_scrolled_view_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum_height, + gint *natural_height) +{ + GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, minimum_height, natural_height); +} + +static void +gtk_scrolled_view_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum_width, + gint *natural_width) +{ + GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, minimum_width, natural_width); +} diff --git a/src/gtk/gtkscrolledview.h b/src/gtk/gtkscrolledview.h index 028adbc6a..838b356a6 100644 --- a/src/gtk/gtkscrolledview.h +++ b/src/gtk/gtkscrolledview.h @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2012, 2013 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/keys.scm b/src/gtk/keys.scm index eb18764f0..164182d1a 100644 --- a/src/gtk/keys.scm +++ b/src/gtk/keys.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2009, 2010, 2011, 2012 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/main.scm b/src/gtk/main.scm index d9eebe10e..bf207a75f 100644 --- a/src/gtk/main.scm +++ b/src/gtk/main.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2008, 2009, 2010, 2011, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# @@ -58,12 +58,10 @@ USA. (set! initialized? #f)) (define (init-gtk name args) - (let ((path (system-library-pathname "gtk-shim.so"))) - (if (not (file-loadable? path)) (error "Gtk shim not loadable.")) - (if (let ((s (get-environment-variable "DISPLAY"))) - (and (string? s) (not (string-null? s)))) - (init-gtk* name args) - (warn "DISPLAY not set")))) + (if (let ((s (get-environment-variable "DISPLAY"))) + (and (string? s) (not (string-null? s)))) + (init-gtk* name args) + (warn "DISPLAY not set"))) (define (init-gtk* name args) ;; Call gtk_init_check. Warn if it returns 0. Return a list of diff --git a/src/gtk/make.scm b/src/gtk/make.scm index b1d01e8fe..29c36daab 100644 --- a/src/gtk/make.scm +++ b/src/gtk/make.scm @@ -2,11 +2,10 @@ Load the Gtk option. |# -(load-option 'SUBPROCESS) ; Hacked in main.scm. (load-option 'CAIRO) (load-option 'FFI) ; Referenced in gtk.pkg. (with-loader-base-uri (system-library-uri "gtk/") (lambda () (load-package-set "gtk"))) -(add-subsystem-identification! "Gtk" '(0 4)) +(add-subsystem-identification! "Gtk" '(0 5)) ((access gtk-start (->environment '(gtk main)))) \ No newline at end of file diff --git a/src/gtk/gtk.texinfo b/src/gtk/mit-scheme-gtk.texi similarity index 97% rename from src/gtk/gtk.texinfo rename to src/gtk/mit-scheme-gtk.texi index e0063463f..9a97a6d3e 100644 --- a/src/gtk/gtk.texinfo +++ b/src/gtk/mit-scheme-gtk.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-Texinfo-*- @comment %**start of header -@setfilename mit-scheme-gtk +@setfilename mit-scheme-gtk.info @set VERSION 0.5 @settitle Gtk Plugin @value{VERSION} @comment %**end of header @@ -24,10 +24,11 @@ @end ifnothtml @copying -This manual documents MIT/GNU Scheme's Gtk plugin @value{VERSION}. +This manual documents a Gtk+ plugin for MIT/GNU Scheme, version +@value{VERSION}. -Copyright @copyright{} 2008, 2009, 2010, 2011, 2012, 2013, 2014 -Matthew Birkholz +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, + 2015, 2016 Matthew Birkholz @quotation Permission is granted to copy, distribute and/or modify this document @@ -42,13 +43,13 @@ Documentation License.'' @dircategory Programming Languages @direntry * MIT/GNU Scheme Gtk: (mit-scheme-gtk). - GNOME toolkit plugin. + GNOME toolkits plugin. @end direntry @titlepage @title The MIT/GNU Scheme Gtk Plugin Manual @subtitle Schemely access (@value{VERSION}) to the GNOME toolkits -@subtitle for MIT/GNU Scheme version 9.1 +@subtitle for MIT/GNU Scheme version 9.3 @author by Matt Birkholz (@email{birkholz@@alum.mit.edu}) @page @vskip 0pt plus 1filll @@ -66,7 +67,6 @@ Documentation License.'' * Introduction:: * GTK Graphics Device:: * API Reference:: -* Installation:: * Implementation Notes:: This is for Scheme widget developers. * GNU Free Documentation License:: @end menu @@ -99,13 +99,12 @@ re-written to use the Gtk system. Notice that the program does not need the FFI; it uses no FFI syntax. There is no need to @code{(load-option 'FFI)}. -@verbatiminclude ../../src/gtk/hello.scm +@verbatiminclude hello.scm -To run this program, enter the following command lines in the -@file{src/gtk} directory of your build tree. +To run this program, enter the following lines. @example - ../microcode/scheme --library ../lib + mit-scheme (load-option 'Gtk) (ge '(gtk)) (load "hello") @@ -118,19 +117,22 @@ The Gtk Event Viewer is a simple Scheme widget --- a GtkWidget whose methods are implemented by calls back into Scheme --- and a straightforward translation of Havoc Pennington's GtkEv (from @uref{http://developer.gnome.org/doc/GGAD/,, GGAD}). To see this -widget enter the following command lines in the @file{src/gtk} -directory of your build tree. +widget enter the following lines. @example - ../microcode/scheme --library ../lib + mit-scheme (load-option 'Gtk) (make-gtk-event-viewer-demo) @end example The code can be found in @file{gtk-ev.scm}. -@anchor{Fix Demo} -@unnumberedsec Fix Demo +@deffn Procedure make-gtk-event-viewer-demo +Create a window displaying the Gtk Event Viewer app. +@end deffn + +@anchor{Fix Layout Demo} +@unnumberedsec Fix Layout Demo The Gtk system provides a fixnum-centric canvas abstraction based on the ancient X Window draw requests: XDrawLine, XDrawRectangle, @@ -141,17 +143,20 @@ A demo of two fix-layout widgets displaying one drawing is provided. The drawing contains a sample of each type of fix-ink with animation and mouse tracking (highlighting the character under the pointer, and reporting the inks under a click). To see these widgets in action, -enter the following command lines in the @file{src/gtk} directory of -your build tree. +enter the following lines. @example - ../microcode/scheme --library ../lib + mit-scheme (load-option 'Gtk) (make-fix-layout-demo) @end example The code can be found in @file{fix-demo.scm}. +@deffn Procedure make-fix-layout-demo +Create a window displaying the Fix Layout Demo app. +@end deffn + @unnumberedsec SWAT The Gtk system contains a proof-of-concept emulation of the old Tk3.2 @@ -160,15 +165,18 @@ described in @cite{Introduction to SWAT}, by Hal Abelson, Natalya Cohen and Jim Miller. The emulation lacks many widget types and options, and is @emph{just} sufficient to run Pole Zero. -To see the Pole Zero application, enter the following command lines in -the @file{src/gtk} directory of your build tree. +To see the Pole Zero application, enter the following lines. @example - ../microcode/scheme --library ../lib + mit-scheme-pucked (load-option 'Gtk) (make-pole-zero) @end example +@deffn Procedure make-pole-zero +Create a window displaying the SWAT Pole Zero app. +@end deffn + @unnumberedsec The Gtk Package Most of the Gtk system's public bindings are in the @code{(gtk)} @@ -277,7 +285,7 @@ and updates any drawings containing @var{device}'s descriptor, a used by @code{graphics-flush}. @end deffn -@node API Reference, Installation, GTK Graphics Device, Top +@node API Reference, Implementation Notes, GTK Graphics Device, Top @appendix API Reference This appendix lists all of the procedures and data types that make up @@ -1197,7 +1205,7 @@ both children. The difference between paned windows and paned viewports can be observed by substituting @code{gtk-paned-new} and @code{gtk-paned-view-new} in the fix layout demo. -@xref{Fix Demo}. +@xref{Fix Layout Demo}. @end deffn @deffn Procedure gtk-paned-view? object @@ -1260,7 +1268,7 @@ and interferes with resizing. The difference between a scrolled window and a scrolled viewport can be observed by substituting @code{gtk-scrolled-view-new} and @code{gtk-scrolled-window-new} in the fix layout demo. -@xref{Fix Demo}. +@xref{Fix Layout Demo}. @end deffn @deffn Procedure gtk-scrolled-view? object @@ -2035,31 +2043,7 @@ The key name (character or symbol) associated with the Gdk If @var{open?} is @code{#f}, the time slice window is closed, else it is opened. @end deffn -@node Installation, Implementation Notes, API Reference, Top -@chapter Installation - -Unpack the source and build in the usual way, but do not call -@code{./configure} with a @code{--prefix} argument. This plugin will -be installed in the system library path of the machine run by the -@code{mit-scheme} command. You can override this command name by -setting @code{MIT_SCHEME_EXE}. You can override the system library -path of any machine by passing it the @code{--library} option on the -commandline, or the @code{MITSCHEME_LIBRARY_PATH} variable in the -environment. - -@example - tar xzf gtk-0.5.tar.gz - cd gtk-0.5 - ./configure - make - make check - make install - make install-info - make install-html - make install-pdf -@end example - -@node Implementation Notes, GNU Free Documentation License, Installation, Top +@node Implementation Notes, GNU Free Documentation License, API Reference, Top @chapter Implementation Notes This chapter is for the hapless debugger, or potential widget @@ -2093,6 +2077,7 @@ class is a specialization of the abstract gtk-object class. @node GNU Free Documentation License, , Implementation Notes, Top @appendix GNU Free Documentation License +@cindex FDL, GNU Free Documentation License @center Version 1.2, November 2002 @display diff --git a/src/gtk/gtk-optiondb.scm b/src/gtk/optiondb.scm similarity index 78% rename from src/gtk/gtk-optiondb.scm rename to src/gtk/optiondb.scm index 1136a024e..57e98e07c 100644 --- a/src/gtk/gtk-optiondb.scm +++ b/src/gtk/optiondb.scm @@ -11,5 +11,5 @@ (further-load-options (merge-pathnames "optiondb" - (last ((access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file + (cadr (access library-directory-path + (->environment '(runtime pathname)))))) \ No newline at end of file diff --git a/src/gtk/scm-widget.scm b/src/gtk/scm-widget.scm index 981e21048..01e9c31e7 100644 --- a/src/gtk/scm-widget.scm +++ b/src/gtk/scm-widget.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/scmwidget.c b/src/gtk/scmwidget.c index ccefbaec7..320cd4c3e 100644 --- a/src/gtk/scmwidget.c +++ b/src/gtk/scmwidget.c @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2007, 2008, 2009, 2010, 2012 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/scmwidget.h b/src/gtk/scmwidget.h index 8d3dfef48..edf99ca5c 100644 --- a/src/gtk/scmwidget.h +++ b/src/gtk/scmwidget.h @@ -1,23 +1,23 @@ /* -*-C-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ diff --git a/src/gtk/swat.scm b/src/gtk/swat.scm index 0a74514d4..4bbe27cff 100644 --- a/src/gtk/swat.scm +++ b/src/gtk/swat.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2010, 2011, 2012, 2013 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/gtk/test-gport-performance.scm b/src/gtk/test-gport-performance.scm index 413cf47dd..b10b26958 100644 --- a/src/gtk/test-gport-performance.scm +++ b/src/gtk/test-gport-performance.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2011 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a gtk plugin for MIT/GNU Scheme. -MIT/GNU Scheme 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 plugin 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. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |#