With this commit we finally say goodbye to SIOD. This large set of changes

2006-10-15  Kevin Cozens  <kcozens@cvs.gnome.org>

	With this commit we finally say goodbye to SIOD. This large set of
	changes updates the Script-Fu plug-in to use the TinyScheme Scheme
	interpreter. These changes originated with changes originally made
	to Script-Fu which created Tiny-Fu (aka. the gimp-tiny-fu module).

	* plug-ins/script-fu/Makefile.am
	* plug-ins/script-fu/script-fu-console.c
	* plug-ins/script-fu/script-fu-interface.c
	* plug-ins/script-fu/script-fu-scripts.c
	* plug-ins/script-fu/script-fu-scripts.h
	* plug-ins/script-fu/script-fu-server.c
	* plug-ins/script-fu/script-fu-text-console.c
	* plug-ins/script-fu/script-fu.c: Updated with the changes made to
	these files as part of the work on the Tiny-Fu project.

	* plug-ins/script-fu/scheme-wrapper.c
	* plug-ins/script-fu/scheme-wrapper.h: Renamed from siod-wrapper.[ch]
	and updated based on differences to ts-wrapper.[ch] from gimp-tiny-fu.

	* plug-ins/script-fu/ftx/*
	* plug-ins/script-fu/re/*
	* plug-ins/script-fu/tinyscheme/*
	* plug-ins/script-fu/scripts/script-fu.init
	* plug-ins/script-fu/scripts/script-fu-compat.init
	* plug-ins/script-fu/scripts/contactsheet.scm
	* plug-ins/script-fu/scripts/script-fu-set-cmap.scm
	* plug-ins/script-fu/scripts/script-fu-util-setpt.scm
	* plug-ins/script-fu/scripts/ts-helloworld.scm: Added all of these
	files and directories from Tiny-Fu. Updated the Makefile.am files
	of ftx, re, and tinyscheme now they are in the GIMP source tree.

	* plug-ins/script-fu/scripts/*.scm: All scripts have been updated as
	needed to ensure they will work with the TinyScheme interpreter. Most
	of the files have been reformatted making it easier to see the syntax
	of Scheme and making them easier to read.

	* plug-ins/script-fu/scripts/Makefile.am: Updated script file lists.

	* plug-ins/script-fu/siod-wrapper.c
	* plug-ins/script-fu/siod-wrapper.h
	* plug-ins/script-fu/siod/*: Removed obsolete files.

	* configure.in: Updated list of files in AC_CONFIG_FILES. Changed
	--disable-script-fu to --without-script-fu which it should have
	been when originally added.

	* INSTALL: Updated to show change to --without-script-fu.
This commit is contained in:
Kevin Cozens
2006-10-16 01:08:54 +00:00
committed by Kevin Cozens
parent 9314c3ea8e
commit 6239dddda3
127 changed files with 9946 additions and 17357 deletions

View File

@ -1,8 +1,8 @@
; The GIMP -- an image manipulation program
; Copyright (C) 1995 Spencer Kimball and Peter Mattis
;
;
; Based on select-to-brush by
; Copyright (c) 1997 Adrian Likins aklikins@eos.ncsu.edu
; Copyright (c) 1997 Adrian Likins aklikins@eos.ncsu.edu
; Author Cameron Gregory, http://www.flamingtext.com/
;
; Takes the current selection, saves it as a pattern and makes it the active
@ -12,12 +12,12 @@
; it under the terms of the GNU General Public License as published by
; the Free Software Foundation; either version 2 of the License, or
; (at your option) any later version.
;
;
; This program is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
; GNU General Public License for more details.
;
;
; You should have received a copy of the GNU General Public License
; along with this program; if not, write to the Free Software
; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@ -25,29 +25,46 @@
(define (script-fu-selection-to-pattern image drawable desc filename)
(let* (
(selection-width)
(selection-height)
(selection-bounds)
(select-offset-x)
(select-offset-y)
(pattern-draw-type)
(pattern-image-type)
(pattern-image)
(pattern-draw)
(filename2)
)
(if (= (car (gimp-selection-is-empty image)) TRUE)
(begin
(set! selection-width (car (gimp-drawable-width drawable)))
(set! selection-height (car (gimp-drawable-height drawable))))
(set! selection-width (car (gimp-drawable-width drawable)))
(set! selection-height (car (gimp-drawable-height drawable)))
)
(begin
(set! selection-bounds (gimp-drawable-mask-bounds drawable))
(set! select-offset-x (cadr selection-bounds))
(set! select-offset-y (caddr selection-bounds))
(set! selection-width (- (cadr (cddr selection-bounds)) select-offset-x))
(set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y))))
(set! selection-bounds (gimp-drawable-mask-bounds drawable))
(set! select-offset-x (cadr selection-bounds))
(set! select-offset-y (caddr selection-bounds))
(set! selection-width (- (cadr (cddr selection-bounds)) select-offset-x))
(set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y))
)
)
(if (= (car (gimp-drawable-has-alpha drawable)) TRUE)
(set! pattern-draw-type RGBA-IMAGE)
(set! pattern-draw-type RGB-IMAGE))
(set! pattern-draw-type RGB-IMAGE)
)
(set! pattern-image-type RGB)
(set! pattern-image (car (gimp-image-new selection-width selection-height
pattern-image-type)))
pattern-image-type)))
(set! pattern-draw
(car (gimp-layer-new pattern-image selection-width selection-height
pattern-draw-type "Pattern" 100 NORMAL-MODE)))
(car (gimp-layer-new pattern-image selection-width selection-height
pattern-draw-type "Pattern" 100 NORMAL-MODE)))
(gimp-drawable-fill pattern-draw TRANSPARENT-FILL)
@ -58,27 +75,30 @@
(let ((floating-sel (car (gimp-edit-paste pattern-draw FALSE))))
(gimp-floating-sel-anchor floating-sel))
(set! filename2 (string-append gimp-directory
"/patterns/"
filename
(number->string image)
".pat"))
(set! filename2 (string-append gimp-directory DIR-SEPARATOR
"patterns" DIR-SEPARATOR
filename
(number->string image)
".pat"))
(file-pat-save 1 pattern-image pattern-draw filename2 "" desc)
(gimp-patterns-refresh)
(gimp-context-set-pattern desc)
(gimp-image-delete pattern-image)
(gimp-displays-flush))
(gimp-displays-flush)
)
)
(script-fu-register "script-fu-selection-to-pattern"
_"To _Pattern..."
"Convert a selection to a pattern"
"Cameron Gregory <cameron@bloke.com>"
"Cameron Gregory"
"09/02/2003"
"RGB* GRAY*"
SF-IMAGE "Image" 0
SF-DRAWABLE "Drawable" 0
SF-STRING _"Pattern name" "My Pattern"
SF-STRING _"File name" "mypattern")
_"To _Pattern..."
_"Convert a selection to a pattern"
"Cameron Gregory <cameron@bloke.com>"
"Cameron Gregory"
"09/02/2003"
"RGB* GRAY*"
SF-IMAGE "Image" 0
SF-DRAWABLE "Drawable" 0
SF-STRING _"Pattern name" "My Pattern"
SF-STRING _"File name" "mypattern"
)