diff --git a/CHANGES b/CHANGES index 9366a56..9c789ab 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,25 @@ +09/03/99 Release 4.0.0 +---------------------- +Mains changes/modifications since 4.0 are: + + * Lot of Win32 fixes + + * , STklos classes. + + * Integration of some finals SRFI (0, 2, 6, 8) + + * define-syntax (but not let-syntax and let-syntax*) + + * Lot of bug fixes. + + * New License Policy (request for commercial apps no more needed). + 02/02/99 Release 3.99.4 ----------------------- Mains changes/modifications since 3.99.3 are: * Works on Windows too (need some more testing, since this is - far form perfect) + far from perfect) * A console mode (which is used by default on Windows, but can be used with the -console option on Unix) diff --git a/COPYRIGHTS b/COPYRIGHTS index f6bd7fc..27811fd 100644 --- a/COPYRIGHTS +++ b/COPYRIGHTS @@ -2,15 +2,16 @@ Since I'm not a lawyer, I don't know where to put copyrigth notices and permission notices of softwares I use. Consequently I put them here in hope it's sufficient.... -Note: - STk licence seems not to be as clear as I hope. The main idea is -that you can do what you want with STk. You can even use it in -commercial products. The only restriction is that you must prevent me -if you intend to use it in a commercial product (so I can send you a -"written permission" for efectively using it). The goal is not to -restrict commercial applications but only to count them. If someone, -fluent in english and which like those aspects, can help me to make -things clearer... +Note: + + For version 4.0, the clause for commercial software in the STk + license has been deleted. That means that you can make a commercial + product which uses STk without asking me permission to do so, as it + was required before. The idea of this clause was not to restrict + commercial applications but rather to count them. However, it seems + that this clause was more harmful than useful. Anyway, if you make a + commercial product which uses STk, it would be kind to tell me so. + ============================================================================== @@ -109,18 +110,17 @@ STk Copyright ------------- /* - * Copyright © 1993-1996 Erick Gallesio - I3S-CNRS/ESSI + * Copyright © 1993-1999 Erick Gallesio - I3S-CNRS/ESSI * * - * Permission to use, copy, and/or distribute this software and its - * documentation for any purpose and without fee is hereby granted, provided - * that both the above copyright notice and this permission notice appear in - * all copies and derived works. Fees for distribution or use of this - * software or derived works may only be charged with express written - * permission of the copyright holder. - * This software is provided ``as is'' without express or implied warranty. + * Permission to use, copy, modify, distribute,and license this + * software and its documentation for any purpose is hereby granted, + * provided that existing copyright notices are retained in all + * copies and that this notice is included verbatim in any + * distributions. No written agreement, license, or royalty fee is + * required for any of the authorized uses. + * This software is provided ``AS IS'' without express or implied + * warranty. * - * This software is a derivative work of other copyrighted softwares; the - * copyright notices of these softwares are placed in the file COPYRIGHTS - * - */ \ No newline at end of file + */ + diff --git a/ChangeLog b/ChangeLog index 027924d..7594c7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,508 @@ +1999-09-05 Erick Gallesio + + * Release 4.0.0 + + * STk.prj: Added the file Combobox.stklos + +1999-09-04 Erick Gallesio + + * Demos/server.stk : Set the process in a variable to avoid the + socket be closed when a GC occurs. + + * Win32: some minor corrections + +1999-09-03 Erick Gallesio + + * First package named 4.0 (Let's pray). + + * New Copyright applied to all the files which need it. The new + copyright deletes the restriction on commercial applocations. + + * Tk/generic/tkConfig.c (DoConfig): Correction of a long standing + bug signalled by Brian Denheyer about the + environments which were garbaged on checkbutton menu entry. + + * configure.in : Modifications for RPM 3.0 packaging + +1999-09-01 Erick Gallesio + + * Src/syntax.c (syntax_let_family): Bug correction in named let: + the scope of the name of a * named let encloses only the body of + the let and not the * initialization values of the bound + variables. That means that + (let ((f -)) (let f ((n (f 1))) n)) => -1 + rather than 1. This (apparently very common) bug was signaled in + comp.lang.scheme. + + * Src/print.c (STk_print): Deleted an extra close parenthesis when + printing a local var. + +1999-08-31 Erick Gallesio + + * Lib/srfi-7.stk: New file for SRFI-7 (PROGRAM) + + * Src/syntax.c (STk_syntax_begin): Accepts now the form "(begin)" + without complaining about a null body + + * Src/port.c : slight modification to input-port? primtive: it + returns #t for all the input port (i.e. file, string and virtual + port) instead of the file port only. A new primitive as been + added: input-file-port? for testing explicitly if an object is an + input port. Of course, the same applies also for output. This + change was needed to be conform to SRFI-6. + +1999-08-30 Erick Gallesio + + * Lib/defsyntax.stk : R4RS define-syntax. This is the Macro By + Example implementation from Dorai Sitaram + adapted for STk. + + * Lib/srfi-0.stk: New file implementing srfi-0 + + * Lib/srfi-2.stk: New file implementing srfi-2 + +1999-08-24 Erick Gallesio + + * Demos/widget.stk (show-code): Changed the way the code file is + read to work under Win32 too. + +1999-08-23 Erick Gallesio + + * Lib/init.stk (STk): Changed the time where the autoload of the + graphical error routine is done, so that an error during the + reading of initialization file doesn't pop this weird black empty + window on the screen. + + * Src/port.c (STk_close_file_port): closing a closed file with + fclose on glibc2.1.1 dumps core. fclose has been replaced by a + fflush and a close. + + * Lib/winsocket.stklos : New file which implements sockets for + Win32. This file is a contribution of Steve Pruitt + + +1999-08-22 Erick Gallesio + + * Demos/console-demo.stk: New (simple) demo showing the console in + action. + + * Makefile.in (install-no-strip): New entry to install the + executable without stripping them. This was needed by Brian + Denheyer + + * Lib/console.stk : Added scrollbar in the list of modules when + choosing a new console + +1999-08-19 Erick Gallesio + + * STklos/Tk/Composite/Paned.stklos (): Made the fraction of a + paned an active slot. This was requested by Andrew Dorrell + + +1999-08-18 Erick Gallesio + + * Demos/widget.stk :Changed the Quit button by a new toolbar for + the widget Demo. + +1999-08-16 Erick Gallesio + + * Doc/Reference/Reference*.tex: Big documentation update. + + * Src/io.c (STk_internal_flush): Changed the implementation of + virtual port and make some cleanups. everything is documented now. + +1999-08-15 Erick Gallesio + + * Lib/console.stk : Clos console menu didn't exit the interpreter + on the main console. + + * Lib/help.stk: Modified the help function to deiconify the + browser if it already exists + + * Src/stk.h: Conditionally define TRUE and FALSE as requested by + Shiro Kawai + + * Lib/console.stk : New menu in + console to allow to open a new console in a given module. + + * Src/module.c (STk_all_modules): New primitive "all-modules" + which returns the list of all the living modules. + +1999-08-12 Erick Gallesio + + * Lib/www-url.stk (merge-paths): modified to take into account Win32 + + * Lib/fs.stk: * Lib/win32.stk: fs.stk is the file which will load + either unix.stk or win32.stk depending of the running system. + + * Lib/image.stk : Changed the images are searched. It didn't work + for Win32 + + +1999-08-04 Erick Gallesio + + * Lib/console.stk (console-splash-screen): compute geometry with + quotient rather than "/" (useful for people with odd + resolutions. Yes it exists!) + +1999-08-03 Erick Gallesio + + * Src/unix.c: Modifications to parse correctly DOS filenames. + This is probably not completely correct (DOS guys are really + crazy). + + * Lib/www-url.stk (url-regexp): Changed the regexp for parsing + correctly DOS filename (C:\\A was seen as the path \\A for the + service "C") + +1999-07-02 Erick Gallesio + + * Src/error.c (STk_err): the assignment of the two global is done + now in STk_err to have it even in the context of a CATCH. Patch + provided by Ian Wild . + + * Lib/balloon.stk ((display-balloon-help w)): Correction of a bug + which apperas when the window to which a ballon is associated does + not exists anymore. + + * Lib/dialog.stk: + * Lib/error.stk: + * STklos/Tk/Composite/Msgbox.stklos (): Added more colorful icons + for the standard message boxes + +1999-07-01 Erick Gallesio + + * STklos/stklos.stk: + * Src/stklos.c (next_method_exists): New primitive in STklos: + next-methods-exists? + +1999-06-30 Erick Gallesio + + * Src/symbol.c: New primitive string->uninterned-symbol. + + * Lib/init.stk (gensym): gensym now use an uninterned symbol. + +1999-06-21 Erick Gallesio + + * install.bat: Added the installation of libraries for Win32 as + requested by Jonathan Berry + +1999-06-19 Erick Gallesio + + * Src/hash.c (hash_table_put): + * Src/tk-glue.c (STk_add_callback): Changed the variable new to + new_entry to be more C++ friendly as requested by Jonathan Berry + + +1999-06-06 Erick Gallesio + + * Use a coherent scheme for toolbars. All the pixmaps have been + modified. + +1999-06-05 Erick Gallesio + + * Doc/Reference/Appendix-C.tex (subsection{Example}): Typo error + signalled by Ben L. Di Vito + +1999-06-04 Erick Gallesio + + * Src/proc.c (STk_procedurep): Bug corrcetion: procedure? was + returning #t for all STklos instance, it returns #t for + next-methods and descendants of methods now. + (STk_is_thunk): ditto. + + * Tcl/tclInt.h: The Tcl List type is now hidden (since it is not + used by STk) . It is a request from Jonathan Berry + + +1999-05-28 Erick Gallesio + + * Tk/generic/tkCanvLine.c: Added the option :centerarrow for + lines. The implementation was provided by Sarah Calvo + + + * STklos/Tk/Canvitem.stklos (): Added the center-arrow slot + to the class to take into account the new:centerarrow + option + + +1999-05-26 Erick Gallesio + + ****** All the stuff below has been provided by people at Grammatech + ****** & + + * Tk/generic/tkFrame.c: Declare the menu option of a frame as + a TK_CONFIG_MENU rathere than a TK_CONFIG_STRING. + + * Src/tcl-lib.c (Tcl_CreateInterp): flags field was not + initialized. + + * Src/stk.h: Added #define USE_PROCESS for Win32 + + * Src/eval.c: Two new functions for applying 1 or 2 arguments only. + + * Src/io.c (STk_StdinProc): initializing errno to 0 before a read + system call. + + * Src/dynload.c: Type declaration was uncorrect for a message + issued on architectures without FFI. + + * Src/cont.c (STk_throw): On some architecture, the thunk to be + executed on restauration of a continuation should be in a global + rather than a local variable. + + * Lib/unix.stk: Win32 adaptations + + * Lib/menu.stk: Typos and motion. + + * Lib/init.stk: Win32 fixes + + * Lib/console.stk (console-invoke): fix of STk Error if there were + multiple regions with "input" tag. + + ((init-console module std-console?)): color missing on HPUX + replaced by its value. + + * configure.in: the --prefix option was not correctly propagated + to Tk and Tcl configure scripts. + + * Stack/Makefile.in: new entry install.libs + +1999-05-21 Erick Gallesio + + * Src/dynload.c: + * Src/number.c: + * Src/port.c: + * Src/env.c: Some typo errors signalled by David Fox. + + * Src/tcl-lib.c (Tcl_CreateCommand): bug correction suggested by + David Fox + +1999-05-20 Erick Gallesio + + * STklos/Tk/Composite/Filebox.stklos: When the filebox was first + invoked the "all" button was NOT checked, but the filebox displays + all of the files, i.e., the button doesn't match functionality. + Bug signaled and corrected by Brian Denheyer . + + * STklos/describe.stklos (describe): Extended types were described + as unknown types, whereas a class is automatically defined for + them. + + * Lib/init.stk (STk): added the function repl-write which is used + by the repl-display-result to display results at the toplevel. It + was write*, but it doesn't seem to be appreciated. The new value + is a function which use write or write* for list and write* for + other object. Of course it can be changed by just setting the + repl-write result. + + * STklos/Tk/Composite/Hierarchy.stklos: Added the remove-item! + method. + + * STklos/Tk/Composite/Toolbar.stklos: Modification of the toolbar + code to allow the inclusion of any widget in a toolbar + +1999-05-19 Erick Gallesio + + * Lib/www-browser.stklos (WWW:browser): + * Demos/Widget/Wmenu.stklos (demo-menu): + * Demos/amib.stklos (build-interface): Use the new toolbar widget + instead of simple menu as before. + + * Demos/stklos-widgets.stklos: Added the font-chooser demo. + +1999-05-18 Erick Gallesio + + * STklos/Tk/Composite/Toolbar.stklos (map-toolbar): Added the + convention that spaces of length 0 in a toolbar correspond to a + space which takes all the spaces (i.e. it sets the :expand option + of the packer to #t) + + * Lib/menu.stk (Tk:menu-escape menu): code was incorrect when + using the Escape key on a cascade menu. + + * STklos/Tk/Composite/*.stklos: Added a class to all the composite + widgets, so that it can be initialized from resources. + + * STklos/Tk/Composite/Scrollframe.stklos: Modification to take + into account the width and the height of a Scroll frame. + + * STklos/Tk/Font.stklos: New class which allow to + manipulate fonts as widgets. + +1999-05-16 Erick Gallesio + + * Src/dynload.c (push_argument): New convention: #f is now + accepted for speicfing a NULL value for a string or a pointer. + This was already the case for returned values but not for + parameters. thsi was requested by terry jones + + + * STklos/Tk/Composite/Notepad.stklos (initialize): Set the + highlight thickness of tabs to 0, Otherwise the effect was bad + (unluckily this was the defaut value I set in my .Xdefaults) + + * Lib/font-chooser.stklos (pretty): The weight of the font was + missing. + +1999-05-13 Erick Gallesio + + * STklos/Examples/E3.stklos: Use a require "Tk-classes" instead of + "Canvas", otherwise *top-root* is improperly initialized + +1999-05-11 Erick Gallesio + + * STk.prj: Integration of floating toolbars + + * STklos/Tk/Tk-classes.stklos: Integration of toolbars + + * STklos/Tk/Composite/Toolbar.stklos: New file which implements + the floating toolbar abstraction. This was really a pain to write + (even if it does not seem complicate afterwards :-<). This is not + complete, but it's time to release... + + * STklos/Tk/Menu.stklos: Special clone-widget methods for + and . This was necessary when cloning a toolbar which + contains a menu. + +1999-05-10 Erick Gallesio + + * STk.prj: A pseudo-stable version. + + * Src/tcl-obj.c (Tcl_EvalObj): Added code for evaluating a Tcl_obj + expression. I forgot to write the code when new handlers were + introduced for 3.99.4 :-<. Bug signalled by many, really many, + users. + + * Lib/palette.stk: New functions: make-rgb-color, make-darker-color + make-lighter-color + + * STklos/Tk/Basics.stklos (clone-widget): New generic function. + It allows the creation of a clone of the given widget in another + place in the hierarchy. + +1999-05-06 Erick Gallesio + + * Tk/generic/tkFrame.c (TkCreateFrame): Small modification to + allow the specification of a :colormap which is the empty string + for Frames and toplevels. This is needed for cloning frames. + +1999-05-02 Erick Gallesio + + * Lib/menu.stk: Some global grabs in the Tcl file were reported as + local grab in STk. + + * STklos/Tk/Composite/Combobox.stklos (show/hide-combo-list): + Changed the focus policy for combo boxes + + +1999-05-01 Erick Gallesio + + * Tk/generic/tkPlace.c: Typo error detected in Biglook and which + seems not harmful in STk. + + * Src/vector.c (STk_sort): When sorting a list, there was an + unnecessary copy vector which was allocated. Thanks to Manuel for + signalling this bug. + +1999-04-25 Erick Gallesio + + * Demos/stkfontsel.stk: New demo. + + * Lib/font-chooser.stklos (): When the user exits the widget + without selecting a font, the old font remains the default one. + +1999-04-24 Erick Gallesio + + * Lib/font-chooser.stklos: The font chooser has been completely + rewritten. Now it only use one global variable (instead of 6) and + is cleaner than the older one. The chooser also use the Combobox + composite widget. + +1999-04-17 Erick Gallesio + + * STklos/Tk/Text.stklos (text-see): typo error signalled by + Brian Denheyer + + * Src/argv.c: Added the -version option to stk. This options just + prints the version number and exit the interpreter. + +1999-04-06 Erick Gallesio + + * STklos/Tk/Composite/Combobox.stklos: New Composite widget. + + * STklos/Tk/Tk-classes.stklos (STklos+Tk): Adaptation for the new + composite widget. + +1999-04-01 Erick Gallesio + + * Lib/trace.stk (Trace): Correction of a bug which deals with + environments. Bug signaled by Jacques Chazarain . + + * Src/boolean.c (STk_eqv): Now environment can be compared with + eqv?. Consequently, (eqv? (the-environment) (the-environment)) + returns now #t. + +1999-03-26 Erick Gallesio + + * STklos/describe.stklos (describe): Used ~W instead of ~S in some + format to avoid infinite loops when describing circular structures. + +1999-03-24 Erick Gallesio + + * Src/dynload.c (push_argument): Forgot to implement the boolean case + Patch provided by David Fox . + + * configure.in: Application of corrections for FreeBSD provided by + "F. Heinrichmeyer" + + * STk.prj: Various bug corrections + + * STklos/Tk/Image.stklos (initialize): New method: Pixmap + extension need that the :file or :data be passed when the image + is created => we use a new initialize method rather than the + initialize-image scheme used for bitmaps and photos. + Bug signaled by Brian Denheyer + + +1999-03-13 Erick Gallesio + + * Src/io.c (STk_getc): Correction of a bug on Alpha (OSF does not + seem to set errno to 0 before a read!). Bug signaled by Vincent + Granet + +1999-03-11 Erick Gallesio + + * Tk/generic/tkBind.c: patch to make significant only the first + character of a parameter in a binding lambda (i.e. x1 is now + equivalent to x). Strange behaviour signalled by Brian Denheyer + . + + * Src/primitives.c: New primitive port-closed?. + +1999-02-13 Erick Gallesio + + * Demos/widget.stk: Modification of the path for accessing source + in the widget demo. Thanks to Daniel Ortmann + +1999-02-10 Erick Gallesio + + * Tk/win/tkWinDialog.c (ProcessCDError): compound options for + standard dialog have now a dash (-initialfile => :initial-file, ...) + to be consistent with Unix. + + * Tk/win/tkWinFont.c (WinFontFamilyEnumProc): Modified to + transform font-name into strings rather than symbols. + + * Lib/menu.stk (Tk:menu-button-button-up): Typo correction (thanks + to Eric Fintzel ) + + * STklos/Tk/Composite/Scrollframe.stklos: Rewritten + +1999-02-08 Erick Gallesio + + * STklos/Tk/Composite/Scrollframe.stklos: New widget . + 1999-02-02 Erick Gallesio * Release 3.99.4: This is the last pre 4.0 version. Code for Win32 diff --git a/Contrib/Stetris/stetris.stk b/Contrib/Stetris/stetris.stk index ede7459..e37c86a 100755 --- a/Contrib/Stetris/stetris.stk +++ b/Contrib/Stetris/stetris.stk @@ -95,7 +95,7 @@ ;;; ------------------- Include files ------------------------ (require "Tk-classes") -(require "unix") +(require "fs") (require "dialog") diff --git a/Demos/%README b/Demos/%README index 5965155..0d101eb 100644 --- a/Demos/%README +++ b/Demos/%README @@ -112,6 +112,12 @@ Running demonstration programs in the STk web browser 1.5 Misc + * console-demo.stk + This is a simple demo showing a repl loop in a console. + Run with: ../Src/test-stk -f console.stk + Comment: This demo is useful for Unix users only, since under Win32 STk + is started with such a console. + * colormap.stk This is a simple color palette written in STk. Run with: ../Src/test-stk -f colormap.stk @@ -119,6 +125,10 @@ Running demonstration programs in the STk web browser offers now the function Tk:choose-color which allow to choose a color by name or by value. + * stkfontsel.stk + This is a simple program which uses the STk font chooser. + Run with: ../Src/test-stk -f stkfontsel.stk + * small-ed.stk A small editor to create enhanced text Run with: ../Src/test-stk -f small-ed.stk @@ -182,6 +192,9 @@ Running demonstration programs in the STk web browser Comment: Here again, what is interesting in this demo is not what it does, nothing specially fancy, but how it is easy to program, IMHO. + * classbrowse.stklos This demo shows the STklos class browser. + Run with: ../Src/test-stk -f classbrowse.stklos + 2.2 STklos widgets * widget.stklos @@ -241,6 +254,6 @@ Running demonstration programs in the STk web browser lines. Run with: ../Src/test-stk -f S-scape.stklos - ------------------------------------------------------------------------ + Erick Gallesio -Last modified: Mon Mar 9 19:15:46 CET 1998 +Last modified: Sun Aug 22 21:16:13 CEST 1999 diff --git a/Demos/Html-Demos/animate.stk b/Demos/Html-Demos/animate.stk index 59907e7..85763af 100644 --- a/Demos/Html-Demos/animate.stk +++ b/Demos/Html-Demos/animate.stk @@ -1,20 +1,21 @@ -;;;; animate.stk -- A simple image animation (Demo) +;;;; animate.stk -- A simple image animation (Demo) ;;;; -;;;; Copyright © 1998 Erick Gallesio - I3S-CNRS/ESSI +;;;; Copyright © 1998-1999 Erick Gallesio - I3S-CNRS/ESSI ;;;; -;;;; Permission to use, copy, and/or distribute this software and its -;;;; documentation for any purpose and without fee is hereby granted, provided -;;;; that both the above copyright notice and this permission notice appear in -;;;; all copies and derived works. Fees for distribution or use of this -;;;; software or derived works may only be charged with express written -;;;; permission of the copyright holder. -;;;; This software is provided ``as is'' without express or implied warranty. +;;;; Permission to use, copy, modify, distribute,and license this +;;;; software and its documentation for any purpose is hereby granted, +;;;; provided that existing copyright notices are retained in all +;;;; copies and that this notice is included verbatim in any +;;;; distributions. No written agreement, license, or royalty fee is +;;;; required for any of the authorized uses. +;;;; +;;;; This software is provided ``AS IS'' without express or implied +;;;; warranty. ;;;; -;;;; $Id: animate.stk 1.1 Tue, 10 Mar 1998 21:43:37 +0100 eg $ ;;;; ;;;; Author: Erick Gallesio [eg@unice.fr] ;;;; Creation date: 9-Mar-1998 18:51 -;;;;Last file update: 9-Mar-1998 21:07 +;;;;Last file update: 3-Sep-1999 18:45 (eg) (define *img* #f) diff --git a/Demos/Html-Demos/puzzle.stk b/Demos/Html-Demos/puzzle.stk index b0d0df3..785be5c 100644 --- a/Demos/Html-Demos/puzzle.stk +++ b/Demos/Html-Demos/puzzle.stk @@ -1,20 +1,20 @@ ;;;; puzzle.stk -- A puzzle written in STk (from the Tcl Demo) ;;;; -;;;; Copyright © 1998 Erick Gallesio - I3S-CNRS/ESSI +;;;; Copyright © 1998-1999 Erick Gallesio - I3S-CNRS/ESSI ;;;; -;;;; Permission to use, copy, and/or distribute this software and its -;;;; documentation for any purpose and without fee is hereby granted, provided -;;;; that both the above copyright notice and this permission notice appear in -;;;; all copies and derived works. Fees for distribution or use of this -;;;; software or derived works may only be charged with express written -;;;; permission of the copyright holder. -;;;; This software is provided ``as is'' without express or implied warranty. +;;;; Permission to use, copy, modify, distribute,and license this +;;;; software and its documentation for any purpose is hereby granted, +;;;; provided that existing copyright notices are retained in all +;;;; copies and that this notice is included verbatim in any +;;;; distributions. No written agreement, license, or royalty fee is +;;;; required for any of the authorized uses. ;;;; -;;;; $Id: puzzle.stk 1.1 Tue, 10 Mar 1998 21:43:37 +0100 eg $ +;;;; This software is provided ``AS IS'' without express or implied +;;;; warranty. ;;;; ;;;; Author: Erick Gallesio [eg@unice.fr] ;;;; Creation date: 9-Mar-1998 21:11 -;;;;Last file update: 9-Mar-1998 21:37 +;;;;Last file update: 3-Sep-1999 18:50 (eg) (define (display-puzzle parent) diff --git a/Demos/Makefile b/Demos/Makefile old mode 100755 new mode 100644 index 7a014da..18e0f20 --- a/Demos/Makefile +++ b/Demos/Makefile @@ -1,10 +1,23 @@ # # Makefile for the Demos directory # +# Copyright © 1993-1999 Erick Gallesio - I3S-CNRS/ESSI +# +# Permission to use, copy, modify, distribute,and license this +# software and its documentation for any purpose is hereby granted, +# provided that existing copyright notices are retained in all +# copies and that this notice is included verbatim in any +# distributions. No written agreement, license, or royalty fee is +# required for any of the authorized uses. +# This software is provided ``AS IS'' without express or implied +# warranty. +# +# Last file update: 3-Sep-1999 19:20 (eg) +# include ../config.make -DEMODIR=$(libdir)/Demos +DEMODIR=$(root)$(libdir)/Demos what: @echo "Type make install to install demos" @@ -25,7 +38,7 @@ install: cp Html-Demos/*.html $(DEMODIR)/Html-Demos chmod 0644 $(DEMODIR)/Html-Demos/*.html mkdir $(DEMODIR)/Html-Demos/Images; chmod 0755 $(DEMODIR)/Html-Demos/Images - cp Html-Demos/Images/* $(DEMODIR)/Html-Demos/Images + cp Html-Demos/Images/*.gif $(DEMODIR)/Html-Demos/Images chmod 0644 $(DEMODIR)/Html-Demos/Images/* (cd $(DEMODIR)/Html-Demos; ln -s ../amib.stklos ../stklos-widgets .) diff --git a/Demos/README.html b/Demos/README.html index 92e652a..ebda974 100644 --- a/Demos/README.html +++ b/Demos/README.html @@ -1,7 +1,7 @@ - Demo directory README (Version 3.99 - March 1998) + Demo directory README (Version 4.0 - August 1999) @@ -194,6 +194,17 @@

1.5 Misc

    +

  • + console-demo.stk +
    + This is a simple demo showing a repl loop in a console. +
    + Run with: + ../Src/test-stk -f console.stk +
    + Comment: This demo is useful for Unix users only, since under + Win32 STk is started with such a console. +

  • colormap.stk
    @@ -206,6 +217,14 @@ STk offers now the function Tk:choose-color which allow to choose a color by name or by value. +

  • + stkfontsel.stk +
    + This is a simple program which uses the STk font chooser. +
    + Run with: + ../Src/test-stk -f stkfontsel.stk +

  • small-ed.stk
    @@ -444,7 +463,7 @@
    Erick Gallesio
    -Last modified: Sat Sep 26 18:44:39 CEST 1998 +Last modified: Sat Sep 4 15:02:13 CEST 1999 diff --git a/Demos/S-scape.stklos b/Demos/S-scape.stklos old mode 100755 new mode 100644 index 335b3d5..8b699ad --- a/Demos/S-scape.stklos +++ b/Demos/S-scape.stklos @@ -3,19 +3,21 @@ ;;;; ;;;; S - s c a p e . s t k l o s -- A simple WEB browser ;;;; -;;;; Copyright © 1993-1998 Erick Gallesio - I3S-CNRS/ESSI -;;;; -;;;; Permission to use, copy, and/or distribute this software and its -;;;; documentation for any purpose and without fee is hereby granted, provided -;;;; that both the above copyright notice and this permission notice appear in -;;;; all copies and derived works. Fees for distribution or use of this -;;;; software or derived works may only be charged with express written -;;;; permission of the copyright holder. -;;;; This software is provided ``as is'' without express or implied warranty. +;;;; Copyright © 1996-1999 Erick Gallesio - I3S-CNRS/ESSI +;;;; +;;;; Permission to use, copy, modify, distribute,and license this +;;;; software and its documentation for any purpose is hereby granted, +;;;; provided that existing copyright notices are retained in all +;;;; copies and that this notice is included verbatim in any +;;;; distributions. No written agreement, license, or royalty fee is +;;;; required for any of the authorized uses. +;;;; +;;;; This software is provided ``AS IS'' without express or implied +;;;; warranty. ;;;; ;;;; Author: Erick Gallesio [eg@unice.fr] ;;;; Creation date: 3-Nov-1996 18:44 -;;;; Last file update: 2-Mar-1998 09:42 +;;;; Last file update: 3-Sep-1999 19:13 (eg) ;;;; (require "www-browser") diff --git a/Demos/Widget/Wmenu.stklos b/Demos/Widget/Wmenu.stklos index 84527ef..0c68244 100644 --- a/Demos/Widget/Wmenu.stklos +++ b/Demos/Widget/Wmenu.stklos @@ -34,7 +34,7 @@ `(command :label ,mess :background ,mess :command ,(lambda () (format #t "You invoked ~S\n" mess)))) - (define f (make-menubar w + (define f (make-toolbar w `(("File" ("Open ..." ,(lambda () (mess "Open ..."))) ("New" ,(lambda () (mess "New"))) @@ -59,16 +59,16 @@ ,(print-hello-goodbye "Hello" "a") ,(print-hello-goodbye "Goodbye" "b") ("Check buttons" - ((check :label "Oil checked" :variable oil) + (check :label "Oil checked" :variable oil) (check :label "Transmission checked" :variable trans) (check :label "Brakes checked" :variable brakes) (check :label "Lights checked" :variable lights) ("") ("Show current values" ,(lambda () - (show-variables w '(oil trans brakes lights)))))) + (show-variables w '(oil trans brakes lights))))) ("Radio buttons" - ((radio :label "10 point" :variable point-size :value 10) + (radio :label "10 point" :variable point-size :value 10) (radio :label "14 point" :variable point-size :value 14) (radio :label "18 point" :variable point-size :value 18) (radio :label "24 point" :variable point-size :value 24) @@ -79,7 +79,7 @@ (radio :label "Italic" :variable style :value "italic") ("") ("Show current values" - ,(lambda () (show-variables w '(style point-size))))))) + ,(lambda () (show-variables w '(style point-size)))))) ("Icons" (command :bitmap ,(string-append "@" *stk-images* "/pattern") :command ,(lambda () @@ -106,10 +106,10 @@ (slot-set! f 'border-width 3) (slot-set! f 'relief "raised") - (pack f - (make