diff --git a/ChangeLog b/ChangeLog index 71f6b34f41..de75d11f65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Sun May 31 01:58:36 PDT 1998 Manish Singh + + * README + * INSTALL: make info a bit more current + + * gimptool.in: update usage message + + * gtkrc.forest2: sample gtkrc file with cool stuff from tigert + + * gimp.1 + * gimptool.1: updated/rewrote some + + * app/fileops.c: removed the "might have tried to save an RGB + image with an indexed plugin" since g_message gives nice user + feedback now + + * app/interface.c: fix the mem leak properly + Sat May 30 23:42:12 PDT 1998 Manish Singh * app/interface.c: plug mem leak in message_box diff --git a/INSTALL b/INSTALL index cc98577ffe..8694fe94a4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ There are three basic steps to building and installing the GIMP on unix: - 1. You need to have installed GTK version 0.99.7 or better + 1. You need to have installed GTK version 1.0.1 or better 2. You may want to install other third party libraries that are needed for some of the available plugins: TIFF, PNG, JPEG, MPEG, etc. diff --git a/Makefile.am b/Makefile.am index 86768cbe6d..0ad8a9ffbe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = libgimp plug-ins app data bin_SCRIPTS = gimptool -EXTRA_DIST = TODO NOTES gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 +EXTRA_DIST = TODO NOTES gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 gtkrc.forest2 gimpdata_DATA = gimprc gimprc_user gtkrc gimp_logo.ppm gimp_splash.ppm gimp_tips.txt ps-menurc diff --git a/NOTES b/NOTES deleted file mode 100644 index 828f433900..0000000000 --- a/NOTES +++ /dev/null @@ -1,8 +0,0 @@ -Some notes on GIMP-0.99.31: - -Please remove everything from your old plugins dir before upgrading to -0.99.31. Some plugins are no longer in the dist and will not be updated. - --- Federico Mena --- Christoph Hoegl --- Manish Singh diff --git a/README b/README index af612a0ad2..0ac8c80bc5 100644 --- a/README +++ b/README @@ -1,11 +1,6 @@ The GIMP: the GNU Image Manipulation Program -------------------------------------------- -This is version 0.99.31 of the GIMP. For the most part it contains all -of the features that will be in version 1.0 of the GIMP. It does, -however, lack a) documentation, b) robustness and c) some of the -plug-ins found in the 0.54 version. - The main difference between v0.99.31 and much earlier versions is the use of a tile based memory management for images. This allows the GIMP to work with images much larger than physical memory in a usable @@ -16,16 +11,6 @@ limited by disk space. It is due to the switch to a tile based memory management system that old plug-ins will not work with this version of the GIMP. -The GIMP uses GNU libtool in order to build shared libraries on a -variety of systems. While this is very nice for making usable -binaries, it can be a pain when trying to debug a program. For that -reason, compilation of shared libraries can be turned off by -specifying the "--disable-shared" option to "configure". Similarly, -compiling with "-O2" instead of "-g" can be specified by using the -"--disable-debug" option to "configure". We strongly recommend -compiling with the debugging flag as the GIMP appears to be much more -buggy when compiled with optimization turned on. Your mileage may vary. - The plug-in API has changed drastically from previous versions. The result is that it is now possible to access much of the GIMP's internals through a database of procedures aptly named the procedure @@ -65,10 +50,9 @@ Script-fu console. Lastly, there is new file format (xcf) designed specifically for saving GIMP images. It handles layers, channels and tiles as well as saving all of the state information about the image, such as the -active channel, the selection, etc. The format needs testing to make -sure that it really is portable (we think we did it right) as well as -robust. It also will probably change sometime in (near) the future to -implement some form of compression for the tiles. +active channel, the selection, etc. It also will probably change +sometime in the future to implement some form of compression for the +tiles. The GIMP's home page is at @@ -98,25 +82,25 @@ the quotes, of course) depending on the list you want to subscribe to. The mailing list archives can be found at http://www.findmail.com/listsaver/gimp-developer/ + http://www.findmail.com/listsaver/gimp-user/ Gimp-user is a mailing list dedicated to user problems, hints and tips, discussion of cool effects, etc. Gimp-developer is oriented to GIMP core and plug-in developers. Most people will only want to be subscribed to gimp-user. -And finally, for the real junkies, there are two IRC channels devoted -to the GIMP :-) On EFNET there is a small #gimp channel. On Byxnet (a -private mostly-GIMP network) there is #gimp, too. Some of the Byxnet -servers are: +And finally, for the real junkies, there is an IRC channel devoted to +the GIMP :-) On Byxnet (a private mostly-GIMP network) there is #gimp. +Many of the developers hang out there. Some of the Byxnet servers are: irc.mint.net:6666 irc.canweb.net:6667 rudolf.canberra.edu.au:6666 levien.com:6666 -More information about Byxnet can be found at - - http://rudolf.canberra.edu.au/gimp/byxnet.html +You can customize the look of the interface quite a bit my editing the +~/.gimp/gtkrc file. A sample file, gtkrc.forest, is included (Thanks to +Tuomas Kuosmanen) Included is a set of keybindings similar to those in Adobe Photoshop (tm). You can find them in the ps-menurc file. To use them, copy this file to diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index ffd1ed395c..0de8cf6fda 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -886,10 +886,10 @@ message_box (char *message, GtkWidget *label_vbox; GtkWidget *label; GtkWidget *button; - char *str; + char *str, *orig; if (message) - message = g_strdup (message); + message = orig = g_strdup (message); else return NULL; @@ -943,7 +943,7 @@ message_box (char *message, gtk_widget_show (label); } - g_free (message); + g_free (orig); msg_box->mbox = mbox; msg_box->callback = callback; diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index ffd1ed395c..0de8cf6fda 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -886,10 +886,10 @@ message_box (char *message, GtkWidget *label_vbox; GtkWidget *label; GtkWidget *button; - char *str; + char *str, *orig; if (message) - message = g_strdup (message); + message = orig = g_strdup (message); else return NULL; @@ -943,7 +943,7 @@ message_box (char *message, gtk_widget_show (label); } - g_free (message); + g_free (orig); msg_box->mbox = mbox; msg_box->callback = callback; diff --git a/app/fileops.c b/app/fileops.c index 341ae448a9..68fc3893e5 100644 --- a/app/fileops.c +++ b/app/fileops.c @@ -915,8 +915,6 @@ file_save_ok_callback (GtkWidget *w, { s = g_string_new ("Save failed: "); g_string_append (s, raw_filename); - g_string_append (s, "\nYou might have tried to save an RGB image with"); - g_string_append (s, "\na plug-in that only supports Indexed or Gray images"); } } message_box (s->str, file_message_box_close_callback, (void *) fs); @@ -1021,8 +1019,6 @@ file_overwrite_yes_callback (GtkWidget *w, s = g_string_new ("Save failed: "); g_string_append (s, overwrite_box->raw_filename); - g_string_append (s, "\nYou might have tried to save an RGB image with"); - g_string_append (s, "\na plug-in that only supports Indexed or Gray images"); message_box (s->str, file_message_box_close_callback, (void *) filesave); g_string_free (s, TRUE); diff --git a/app/interface.c b/app/interface.c index ffd1ed395c..0de8cf6fda 100644 --- a/app/interface.c +++ b/app/interface.c @@ -886,10 +886,10 @@ message_box (char *message, GtkWidget *label_vbox; GtkWidget *label; GtkWidget *button; - char *str; + char *str, *orig; if (message) - message = g_strdup (message); + message = orig = g_strdup (message); else return NULL; @@ -943,7 +943,7 @@ message_box (char *message, gtk_widget_show (label); } - g_free (message); + g_free (orig); msg_box->mbox = mbox; msg_box->callback = callback; diff --git a/gimp.1 b/gimp.1 index e726be49e8..fbc20b6a79 100644 --- a/gimp.1 +++ b/gimp.1 @@ -1,16 +1,16 @@ -.TH GIMP 1 "13 Apr 1998" Version 1.0 +.TH GIMP 1 "31 May 1998" Version 1.0 .SH NAME Gimp - an image manipulation and paint program. .SH SYNOPSIS .B gimp [\-h] [\-\-help] [-v] [\-\-version] [\-b] [\-\-batch \fI\fP] [\-n] [\-\-no\-interface] [\-\-no\-data] [\-\-verbose] [\-\-no\-shm] [\-\-no\-xshm] [\-\-display \fIdisplay\fP] -[\-\-no\-splash] [\-\-no\-splash\-image] [\-\-debug\-handlers] +[\-\-no\-splash] [\-\-no\-splash\-image] [\-\-debug\-handlers] [\-\-console\-messages] .SH DESCRIPTION .PP -The \fIgimp\fP is the GNU Image Manipulation Program. It is used to edit and +The \fIGIMP\fP is the GNU Image Manipulation Program. It is used to edit and manipulate images. It can load and save a variety of image formats and can be used to convert between formats. .PP @@ -18,8 +18,8 @@ Gimp can also be used as a paint program. It features a set of drawing and painting tools such as airbrush, clone, pencil, and paint brush. Painting and drawing tools can be applied to an image with a variety of paint modes. It also offers an extensive array of selection tools like - rectangle, ellipse, fuzzy select, bezier select, - intelligent scissors, and select by color. +rectangle, ellipse, fuzzy select, bezier select, +intelligent scissors, and select by color. .PP Gimp offers a variety of plugins that perform a variety of image manipulations. Examples include bumpmap, edge detect, gaussian blur, and many others. @@ -73,6 +73,10 @@ Do not show the splash screen image as part of the splash screen. .TP 8 .B \-\-debug\-handlers Enable debugging signal handlers. +.TP 8 +.B \-\-console\-messages +Do not popup dialog boxes on errors or warnings. Print the messages on +the console instead. .SH ENVIRONMENT .PP diff --git a/gimptool-1.2.in b/gimptool-1.2.in index de7cf8aa63..a3621e38d3 100644 --- a/gimptool-1.2.in +++ b/gimptool-1.2.in @@ -7,7 +7,7 @@ plug_in_dir=@gimpplugindir@ data_dir=@gimpdatadir@ usage="\ -Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c] [--install-script script.scm] [--install-admin-script script.scm]" +Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c] [--install-bin plug-in] [--install-admin-bin plug-in] [--install-script script.scm] [--install-admin-script script.scm]" noarg="\ Error: Need a plug-in source file to build" diff --git a/gimptool.1 b/gimptool.1 index 0f33b854d1..5ac9b4de44 100644 --- a/gimptool.1 +++ b/gimptool.1 @@ -1,42 +1,76 @@ .TH GIMP "11 May 1998" Version 1.0 .SH NAME -gimp-tool - script to perform various Gimpy functions +gimptool - script to perform various Gimpy functions .SH SYNOPSIS -.B gimp-tool +.B gimptool [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] -[\-\-build \fIplug-in.c\fP] [\-\-install \fIplug-in.c\fP] [\-\-install-admin plug-in.c] +[\-\-build \fIplug\-in.c\fP] [\-\-install \fIplug\-in.c\fP] [\-\-install-admin \fIplug-in.c\fP] +[\-\-install\-bin \fIplug\-in\fP] [\-\-\install\-admin\-bin \fIplug\-in\fP] +[\-\-install\-script \fIscript.scm\fP] [\-\-\install\-admin\-script \fIscript.scm\fP] + + .SH DESCRIPTION .PP -\fIgimp-tool\fP is a tool that can, among other things, build plug-ins -and install them if they are distributed in one .c file. +\fIgimptool\fP is a tool that can, among other things, build plug-ins +or scripts and install them if they are distributed in one source file. .PP -\fIgimp-tool\fP is also used by programs that need to know what libraries -and include-paths \fIGimp\fP was compiled with. .m4 macros for use -with GNU autoconf are also included, to make detection of these libraries -et cetera easy for the upstream maintainer. +\fIgimptool\fP can also be used by programs that need to know what libraries +and include-paths \fIGimp\fP was compiled with. This is especially useful +in Makefiles. + .SH OPTIONS .l -\fIgimp-tool\fP accepts the following options: -.TP 8 -.B \-\-build \fIplug-in.c\fP -Compile and link \fIplug-in.c\fP into a Gimp plug-in. -.TP 8 -.B \-\-install \fIplug-in.c\fP -Compile, link, and install \fIplug-in.c\fP into the user's personal Gimp -configuration directory (for example, /home/che/.gimp/plug-ins/) -.TP 8 -.B \-\-install\-admin \fIplug-in.c\fP -Compile, link, and install \fIplug-in.c\fP into the system-wide Gimp -plug-ins directory (for example, /usr/lib/gimp/0.99/plug-ins/) +\fIgimptool\fP accepts the following options: .TP 8 .B \-\-version -Display the currently installed version of Gimp. +Print the currently installed version of \fIGimp\fP on the standard output. +.TP 8 +.B \-\-build \fIplug-in.c\fP +Compile and link \fIplug-in.c\fP into a \fIGimp\fP plug-in. +.TP 8 +.B \-\-install \fIplug-in.c\fP +Compile, link, and install \fIplug-in.c\fP into the user's personal \fIGimp\fP +plug-in directory (\fB$HOME\fP/.gimp/plug-ins) +.TP 8 +.B \-\-install\-admin \fIplug-in.c\fP +Compile, link, and install \fIplug-in.c\fP into the system-wide \fIGimp\fP +plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins) +.TP 8 +.B \-\-install\-bin \fIplug-in\fP +Install \fIplug-in\fP into the user's personal \fIGimp\fP +plug-in directory (\fB$HOME\fP/.gimp/plug-ins) +.TP 8 +.B \-\-install\-admin\-bin \fIplug-in\fP +Install \fIplug-in\fP into the system-wide \fIGimp\fP +plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins) +.TP 8 +.B \-\-install\-script \fIscript.scm\fP +Install \fIscript.scm\fP into the user's personal \fIGimp\fP +script directory (\fB$HOME\fP/.gimp/scripts) +.TP 8 +.B \-\-install\-admin\-script \fIscript.scm\fP +Install \fIscript.scm\fP into the system-wide \fIGimp\fP +script directory (\fB$PREFIX\fP/share/gimp/scripts) .TP 8 .B \-\-libs -Display the libraries Gimp was compiled with. +Print the linker flags that are necessary to link a \fIGimp\fP plug-in. .TP 8 .B \-\-cflags -Display the flags that were passed to the compiler when Gimp was compiled. +Print the compiler flags that are necessary to compile a \fIGimp\fP plug-in. +.TP 8 +.B \-\-prefix=PREFIX +If specified, use PREFIX instead of the installation prefix that \fIGimp\fP +was built with when computing the output for the \-\-cflags and +\-\-libs options. This option is also used for the exec prefix +if \-\-exec\-prefix was not specified. This option must be specified +before any \-\-libs or \-\-cflags options. +.TP 8 +.B \-\-exec\-prefix=PREFIX +If specified, use PREFIX instead of the installation exec prefix that +\fIGimp\fP was built with when computing the output for the \-\-cflags +and \-\-libs options. This option must be specified before any +\-\-libs or \-\-cflags options. + .SH ENVIRONMENT .PP .TP 8 @@ -47,7 +81,7 @@ to get the location of the gtk-config program. to get the name of the desired C compiler. .TP 8 .B CFLAGS -to get the preferred flags to pass to the C compiler. +to get the preferred flags to pass to the C compiler for plug-in building. .SH SEE ALSO .BR gimp (1), .BR gtk-config (1) diff --git a/gimptool.in b/gimptool.in index de7cf8aa63..a3621e38d3 100644 --- a/gimptool.in +++ b/gimptool.in @@ -7,7 +7,7 @@ plug_in_dir=@gimpplugindir@ data_dir=@gimpdatadir@ usage="\ -Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c] [--install-script script.scm] [--install-admin-script script.scm]" +Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c] [--install-bin plug-in] [--install-admin-bin plug-in] [--install-script script.scm] [--install-admin-script script.scm]" noarg="\ Error: Need a plug-in source file to build" diff --git a/gtkrc.forest2 b/gtkrc.forest2 new file mode 100644 index 0000000000..748e3a74d5 --- /dev/null +++ b/gtkrc.forest2 @@ -0,0 +1,39 @@ +# style [= ] +# { +#