Commit c26040d1 authored by Manish Singh's avatar Manish Singh

corrected test for libXmu for some systems; added test for difftime

* configure.in: corrected test for libXmu for some systems; added test for
difftime

* app/main.c: use glib ATEXIT macro

* app/text_tool.c: applied gimp-stric-980321-0 (text preview refresh)

* plug-ins/script-fu/script-fu-console.c: don't need to init gtkpreview stuff,
since we don't use them

* plug-ins/script-fu/*: many portability fixes

* plug-ins/pnm/pnm.c: sprintf portability patch

* plug-ins now #define RAND_MAX if needed

* plug-ins/sparkle/sparkle.c: applied gimp-joke-980322-1

-Yosh
parent 59b0f6e5
Tue Mar 24 18:03:37 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: corrected test for libXmu for some systems; added
test for difftime
* app/main.c: use glib ATEXIT macro
* app/text_tool.c: applied gimp-stric-980321-0 (text preview
refresh)
* plug-ins/script-fu/script-fu-console.c: don't need to init
gtkpreview stuff, since we don't use them
* plug-ins/script-fu/*: many portability fixes
* plug-ins/pnm/pnm.c: sprintf portability patch
* plug-ins now #define RAND_MAX if needed
* plug-ins/sparkle/sparkle.c: applied gimp-joke-980322-1
Tue Mar 24 04:19:55 PST 1998 Manish Singh <yosh@gimp.org>
* app/convert.c: fix for fencepost error from Adam
......
Please add things to this file when the need to do them is
discovered.
* configure: SunOS 4 SEEK_* and RAND_MAX defines
* configure: check for regex library presence
......@@ -34,11 +34,9 @@
#undef IPC_RMID_DEFERRED_RELEASE
#undef NO_DIFFTIME
#undef NO_FD_SET
#undef RETSIGTYPE
#undef TIME_WITH_SYS_TIME
#undef RAND_FUNC
#undef SRAND_FUNC
......
......@@ -79,7 +79,7 @@ main (int argc, char **argv)
int i, j;
gchar *display_name, *display_env;
atexit (g_mem_profile);
ATEXIT (g_mem_profile);
/* Initialize variables */
prog_name = argv[0];
......
......@@ -884,9 +884,11 @@ text_size_key_function (GtkWidget *w,
text_tool = (TextTool *) data;
if (event->keyval == GDK_Return)
if ((event->keyval == GDK_Return) || (event->keyval == GDK_Tab) ||
(event->keyval == GDK_space))
{
gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
if (event->keyval != GDK_Tab)
gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
old_value = atoi (gtk_entry_get_text (GTK_ENTRY (text_tool->size_text)));
if (!text_load_font (text_tool))
......
......@@ -884,9 +884,11 @@ text_size_key_function (GtkWidget *w,
text_tool = (TextTool *) data;
if (event->keyval == GDK_Return)
if ((event->keyval == GDK_Return) || (event->keyval == GDK_Tab) ||
(event->keyval == GDK_space))
{
gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
if (event->keyval != GDK_Tab)
gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
old_value = atoi (gtk_entry_get_text (GTK_ENTRY (text_tool->size_text)));
if (!text_load_font (text_tool))
......
......@@ -884,9 +884,11 @@ text_size_key_function (GtkWidget *w,
text_tool = (TextTool *) data;
if (event->keyval == GDK_Return)
if ((event->keyval == GDK_Return) || (event->keyval == GDK_Tab) ||
(event->keyval == GDK_space))
{
gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
if (event->keyval != GDK_Tab)
gtk_signal_emit_stop_by_name (GTK_OBJECT (w), "key_press_event");
old_value = atoi (gtk_entry_get_text (GTK_ENTRY (text_tool->size_text)));
if (!text_load_font (text_tool))
......
......@@ -42,11 +42,9 @@
#undef IPC_RMID_DEFERRED_RELEASE
#undef NO_DIFFTIME
#undef NO_FD_SET
#undef RETSIGTYPE
#undef TIME_WITH_SYS_TIME
#undef RAND_FUNC
#undef SRAND_FUNC
......
......@@ -102,7 +102,7 @@ dnl Test for Xmu
WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu -lXt -lSM -lICE',
AC_CHECK_LIB(Xmu, XmuUpdateMapHints,
WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu -lXt',
AC_MSG_WARN(*** webbrowser plug-in will not be built ***), -lXt), -lXt, -lSM, -lICE)
AC_MSG_WARN(*** webbrowser plug-in will not be built ***), -lXt), -lXt -lSM -lICE)
fi
dnl Test for libaa
......@@ -223,10 +223,13 @@ AC_C_INLINE
dnl Check for random number functions
AC_CHECK_FUNC(random,
AC_DEFINE(RAND_FUNC, random) AC_DEFINE(SRAND_FUNC, srandom),
AC_CHECK_FUNC(lrand48,
AC_DEFINE(RAND_FUNC, lrand48) AC_DEFINE(SRAND_FUNC, srand48),
AC_DEFINE(RAND_FUNC, rand) AC_DEFINE(SRAND_FUNC, srand)))
AC_DEFINE(RAND_FUNC, random) AC_DEFINE(SRAND_FUNC, srandom),
AC_CHECK_FUNC(lrand48,
AC_DEFINE(RAND_FUNC, lrand48) AC_DEFINE(SRAND_FUNC, srand48),
AC_DEFINE(RAND_FUNC, rand) AC_DEFINE(SRAND_FUNC, srand)))
dnl check for difftime
AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME))
CFLAGS="$gimp_save_CFLAGS"
LIBS="$gimp_save_LIBS"
......
......@@ -84,6 +84,10 @@
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define PARAM_FILE_FORMAT_VERSION 1.0
#define PLUG_IN_NAME "plug_in_CML_explorer"
#define SHORT_NAME "CML_explorer"
......
......@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include <libgimp/gimp.h>
#include "bmp.h"
......
......@@ -84,6 +84,10 @@
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define PARAM_FILE_FORMAT_VERSION 1.0
#define PLUG_IN_NAME "plug_in_CML_explorer"
#define SHORT_NAME "CML_explorer"
......
......@@ -33,6 +33,10 @@
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define SCALE_WIDTH 125
#define BLACK 0
#define BG 1
......
......@@ -31,6 +31,10 @@
/* The mosaic logo */
#include "mosaic_logo.h"
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
......
......@@ -69,6 +69,10 @@ static char rcsid[] = "$Id$";
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#if 0
#define DEBUG1 printf
#else
......
......@@ -15,6 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
......
......@@ -28,6 +28,10 @@
#include <string.h>
#include <time.h> /* for seed of random number */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define PLUG_IN_NAME "plug_in_scatter_hsv"
#define SHORT_NAME "scatter_hsv"
#define PROGRESS_NAME "scatter_hsv: scattering..."
......
......@@ -64,6 +64,10 @@
/*---- Defines ----*/
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define TABLE_SIZE 64
#define WEIGHT(T) ((2.0*fabs(T)-3.0)*(T)*(T)+1.0)
......
......@@ -619,7 +619,7 @@ fspike (GPixelRgn *dest_rgn,
gdouble rpos;
gdouble in[MAX_CHANNELS];
gdouble val[MAX_CHANNELS];
gdouble ho, so, vo;
gdouble ho = 1.0, so = 1.0, vo = 1.0;
gdouble theta, efac;
gdouble sfac;
gdouble *gd_tmp1, *gd_tmp2;
......
......@@ -39,10 +39,10 @@ static char ident[] = "@(#) GIMP SunRaster file-plugin v1.95 20-Dec-97";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
typedef int WRITE_FUN(void*,size_t,size_t,FILE*);
typedef unsigned long L_CARD32;
......
......@@ -75,6 +75,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
......
......@@ -48,6 +48,7 @@ static char ident[] = "@(#) GIMP XWD file-plugin v1.92 12-Oct-97";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
......
......@@ -33,6 +33,10 @@
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define SCALE_WIDTH 125
#define BLACK 0
#define BG 1
......
......@@ -87,6 +87,7 @@ static char ident[] = "@(#) libfits.c 0.11 20-Dec-97 (%I%)";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "fitsrw.h"
......
......@@ -52,6 +52,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
......
......@@ -27,6 +27,10 @@
#include "gdk/gdk.h"
#include "ifscompose.h"
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
typedef struct {
GdkPoint point;
gdouble angle;
......
......@@ -31,6 +31,10 @@
/* The mosaic logo */
#include "mosaic_logo.h"
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
......
......@@ -69,6 +69,10 @@ static char rcsid[] = "$Id$";
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#if 0
#define DEBUG1 printf
#else
......
......@@ -15,6 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
......
......@@ -28,6 +28,10 @@
#include <string.h>
#include <time.h> /* for seed of random number */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define PLUG_IN_NAME "plug_in_scatter_hsv"
#define SHORT_NAME "scatter_hsv"
#define PROGRESS_NAME "scatter_hsv: scattering..."
......
......@@ -79,6 +79,7 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/times.h>
#include <glib.h>
#include "siod.h"
#include "siodp.h"
......@@ -169,7 +170,7 @@ long siod_verbose_level = 4;
#endif
/* Added by Spencer Kimball for script-fu shit 6/3/97 */
FILE *siod_output = stdout;
FILE *siod_output;
char *siod_lib = SIOD_LIB_DEFAULT;
......@@ -3137,7 +3138,7 @@ vload (char *fname, long cflag, long rflag)
*end && isalnum (*end);
++end);
j = end - start;
memmove (buffer, start, j);
g_memmove (buffer, start, j);
buffer[strlen (key) - 1] = '_';
buffer[j] = 0;
strcat (buffer, ftype);
......@@ -3509,7 +3510,7 @@ last_c_errmsg (int num)
int xerrno = (num < 0) ? errno : num;
static char serrmsg[100];
char *errmsg;
errmsg = strerror (xerrno);
errmsg = g_strerror (xerrno);
if (!errmsg)
{
sprintf (serrmsg, "errno %d", xerrno);
......@@ -3522,7 +3523,7 @@ LISP
llast_c_errmsg (int num)
{
int xerrno = (num < 0) ? errno : num;
char *errmsg = strerror (xerrno);
char *errmsg = g_strerror (xerrno);
if (!errmsg)
return (flocons (xerrno));
return (cintern (errmsg));
......
......@@ -14,6 +14,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <setjmp.h>
#include "siod.h"
#include "siodp.h"
......
......@@ -158,7 +158,6 @@ script_fu_console_interface ()
GtkWidget *hbox;
gchar **argv;
gint argc;
guchar *color_cube;
argc = 1;
argv = g_new (gchar *, 1);
......@@ -167,16 +166,6 @@ script_fu_console_interface ()
gtk_init (&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
gdk_set_use_xshm(gimp_use_xshm());
gtk_preview_set_gamma(gimp_gamma());
gtk_preview_set_install_cmap(gimp_install_cmap());
color_cube = gimp_color_cube();
gtk_preview_set_color_cube(color_cube[0], color_cube[1], color_cube[2], color_cube[3]);
gtk_widget_set_default_visual(gtk_preview_get_visual());
gtk_widget_set_default_colormap(gtk_preview_get_cmap());
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), "Script-Fu Console");
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
......
......@@ -25,13 +25,17 @@
#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H */
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include "config.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H */
#include "libgimp/gimp.h"
#include "gtk/gtk.h"
#include "siod.h"
......@@ -41,6 +45,9 @@
#define RESPONSE_HEADER 4
#define MAGIC 'G'
#ifdef NO_DIFFTIME
#define difftime(a,b) (((double)(a)) - ((double)(b)))
#endif
#ifndef NO_FD_SET
# define SELECT_MASK fd_set
......@@ -133,7 +140,7 @@ static gint server_sock;
static GList *command_queue = NULL;
static gint queue_length = 0;
static gint request_no = 0;
static FILE *server_log_file = stdout;
static FILE *server_log_file = NULL;
static GHashTable *clientname_ht = NULL;
static SELECT_MASK server_active, server_read;
......
......@@ -26,6 +26,8 @@
#include "script-fu-scripts.h"
#include "script-fu-server.h"
extern FILE *siod_output;
/* External functions
*/
extern void gimp_extension_process (guint timeout);
......@@ -163,6 +165,8 @@ run (char *name,
int *nreturn_vals,
GParam **return_vals)
{
siod_output = stdout;
/* Determine before we allow scripts to register themselves
* whether this is the base, automatically installed script-fu extension
*/
......
......@@ -79,6 +79,7 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/times.h>
#include <glib.h>
#include "siod.h"
#include "siodp.h"
......@@ -169,7 +170,7 @@ long siod_verbose_level = 4;
#endif
/* Added by Spencer Kimball for script-fu shit 6/3/97 */
FILE *siod_output = stdout;
FILE *siod_output;
char *siod_lib = SIOD_LIB_DEFAULT;
......@@ -3137,7 +3138,7 @@ vload (char *fname, long cflag, long rflag)
*end && isalnum (*end);
++end);
j = end - start;
memmove (buffer, start, j);
g_memmove (buffer, start, j);
buffer[strlen (key) - 1] = '_';
buffer[j] = 0;
strcat (buffer, ftype);
......@@ -3509,7 +3510,7 @@ last_c_errmsg (int num)
int xerrno = (num < 0) ? errno : num;
static char serrmsg[100];
char *errmsg;
errmsg = strerror (xerrno);
errmsg = g_strerror (xerrno);
if (!errmsg)
{
sprintf (serrmsg, "errno %d", xerrno);
......@@ -3522,7 +3523,7 @@ LISP
llast_c_errmsg (int num)
{
int xerrno = (num < 0) ? errno : num;
char *errmsg = strerror (xerrno);
char *errmsg = g_strerror (xerrno);
if (!errmsg)
return (flocons (xerrno));
return (cintern (errmsg));
......
......@@ -14,6 +14,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <setjmp.h>
#include "siod.h"
#include "siodp.h"
......
......@@ -22,6 +22,27 @@
* Revision History:
*
* $Log$
* Revision 1.2 1998/03/25 02:17:34 yosh
* * configure.in: corrected test for libXmu for some systems; added test for
* difftime
*
* * app/main.c: use glib ATEXIT macro
*
* * app/text_tool.c: applied gimp-stric-980321-0 (text preview refresh)
*
* * plug-ins/script-fu/script-fu-console.c: don't need to init gtkpreview stuff,
* since we don't use them
*
* * plug-ins/script-fu/*: many portability fixes
*
* * plug-ins/pnm/pnm.c: sprintf portability patch
*
* * plug-ins now #define RAND_MAX if needed
*
* * plug-ins/sparkle/sparkle.c: applied gimp-joke-980322-1
*
* -Yosh
*
* Revision 1.1.1.1 1997/11/24 22:04:37 sopwith
* Let's try this import one last time.
*
......@@ -51,6 +72,8 @@
# include <stdio.h>
# include <stdlib.h>
# include <unistd.h>
# include <string.h>
# ifdef __cplusplus
extern "C" {
......
......@@ -52,6 +52,10 @@
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define ROUND_TO_INT(val) ((val) + 0.5)
typedef gdouble colRGBA[4];
......
......@@ -64,6 +64,10 @@
/*---- Defines ----*/
#ifndef RAND_MAX
#define RAND_MAX 2147483647
#endif /* RAND_MAX */
#define TABLE_SIZE 64
#define WEIGHT(T) ((2.0*fabs(T)-3.0)*(T)*(T)+1.0)
......
......@@ -619,7 +619,7 @@ fspike (GPixelRgn *dest_rgn,
gdouble rpos;
gdouble in[MAX_CHANNELS];
gdouble val[MAX_CHANNELS];
gdouble ho, so, vo;
gdouble ho = 1.0, so = 1.0, vo = 1.0;
gdouble theta, efac;
gdouble sfac;
gdouble *gd_tmp1, *gd_tmp2;
......
......@@ -39,10 +39,10 @@ static char ident[] = "@(#) GIMP SunRaster file-plugin v1.95 20-Dec-97";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
typedef int WRITE_FUN(void*,size_t,size_t,FILE*);
typedef unsigned long L_CARD32;
......
......@@ -75,6 +75,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
......
......@@ -48,6 +48,7 @@ static char ident[] = "@(#) GIMP XWD file-plugin v1.92 12-Oct-97";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment