moved use_shm declaration here, added use_mmx.

2002-03-22  Sven Neumann  <sven@gimp.org>

	* app/appenv.h: moved use_shm declaration here, added use_mmx.

	* app/main.c: added --no-mmx commandline option, removed --no-xshm
	from help output.

	* app/base/base-config.[ch]: removed use-mmx declaration.

	* app/core/core-types.h
	* app/base/base-types.h: include libgimpbase/gimpbasetypes.h from base.

	* app/base/base.c: respect user settings for mmx.

	* app/paint-funcs/paint-funcs.c
	* app/plug-in/plug-in.c: changed accordingly.

	* docs/gimp-1.3.1.in: updated.

ChangeLog

@@ -1,3 +1,22 @@
+2002-03-22  Sven Neumann  <sven@gimp.org>
+
+	* app/appenv.h: moved use_shm declaration here, added use_mmx.
+	
+	* app/main.c: added --no-mmx commandline option, removed --no-xshm
+	from help output.
+	
+	* app/base/base-config.[ch]: removed use-mmx declaration.
+	
+	* app/core/core-types.h
+	* app/base/base-types.h: include libgimpbase/gimpbasetypes.h from base.
+
+	* app/base/base.c: respect user settings for mmx.
+
+	* app/paint-funcs/paint-funcs.c
+	* app/plug-in/plug-in.c: changed accordingly.
+	
+	* docs/gimp-1.3.1.in: updated.
+
 2002-03-22  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added Portuguese (pt) to ALL_LINGUAS

app/appenv.h

@@ -26,6 +26,8 @@ extern gboolean             no_splash;
 extern gboolean             no_splash_image;
 extern gboolean             no_data;
 extern gboolean             be_verbose;
+extern gboolean             use_shm;
+extern gboolean             use_mmx;
 extern gboolean             use_debug_handler;
 extern gboolean             console_messages;
 extern gboolean             restore_session;

app/base/base-config.c

@@ -44,4 +44,3 @@ static GimpBaseConfig  static_base_config =
 #undef INIT_MEMBER
 
 GimpBaseConfig *base_config = &static_base_config;
-gboolean        use_mmx     = FALSE;

app/base/base-config.h

@@ -33,7 +33,6 @@ struct _GimpBaseConfig
 
 
 extern GimpBaseConfig *base_config;
-extern gboolean        use_mmx;
 
 
 #endif  /*  __BASE_CONFIG_H__  */

app/base/base-types.h

@@ -20,6 +20,8 @@
 #define __BASE_TYPES_H__
 
 
+#include "libgimpbase/gimpbasetypes.h"
+
 #include "paint-funcs/paint-funcs-types.h"
 
 #include "base/base-enums.h"

app/base/base.c

@@ -35,13 +35,15 @@
  
 #include "base-types.h"
 
+#include "paint-funcs/paint-funcs.h"
+
 #include "base.h"
 #include "base-config.h"
 #include "detect-mmx.h"
 #include "temp-buf.h"
 #include "tile-swap.h"
 
-#include "paint-funcs/paint-funcs.h"
+#include "appenv.h"
 
 
 static void   toast_old_temp_files (void);
@@ -56,7 +58,7 @@ base_init (void)
   gchar *path;
 
 #ifdef HAVE_ASM_MMX
-  use_mmx = (intel_cpu_features() & (1 << 23)) ? 1 : 0;
+  use_mmx = use_mmx && (intel_cpu_features() & (1 << 23)) ? 1 : 0;
   g_print ("using MMX: %s\n", use_mmx ? "yes" : "no");
 #endif  
 

app/core/core-types.h

@@ -20,7 +20,6 @@
 #define __CORE_TYPES_H__
 
 
-#include "libgimpbase/gimpbasetypes.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "base/base-types.h"

app/main.c

@@ -69,6 +69,7 @@ gboolean             use_shm                 = FALSE;
 gboolean             use_debug_handler       = FALSE;
 gboolean             console_messages        = FALSE;
 gboolean             restore_session         = FALSE;
+gboolean             use_mmx                 = TRUE;
 GimpStackTraceMode   stack_trace_mode        = GIMP_STACK_TRACE_QUERY;
 gchar               *alternate_gimprc        = NULL;
 gchar               *alternate_system_gimprc = NULL;
@@ -252,6 +253,11 @@ main (int    argc,
 	  use_shm = FALSE;
  	  argv[i] = NULL;
 	}
+      else if (strcmp (argv[i], "--no-mmx") == 0)
+	{
+	  use_mmx = FALSE;
+ 	  argv[i] = NULL;
+	}
       else if (strcmp (argv[i], "--debug-handlers") == 0)
 	{
 	  use_debug_handler = TRUE;
@@ -339,7 +345,7 @@ main (int    argc,
       g_print (_("  -v, --version            Output version information.\n"));
       g_print (_("  --verbose                Show startup messages.\n"));	  
       g_print (_("  --no-shm                 Do not use shared memory between GIMP and plugins.\n"));
-      g_print (_("  --no-xshm                Do not use the X Shared Memory extension.\n"));
+      g_print (_("  --no-mmx                 Do not use MMX routines.\n"));
       g_print (_("  --debug-handlers         Enable non-fatal debugging signal handlers.\n"));
       g_print (_("  --display <display>      Use the designated X display.\n"));
       g_print (_("  --system-gimprc <gimprc> Use an alternate system gimprc file.\n"));

app/paint-funcs/paint-funcs.c

@@ -29,7 +29,6 @@
 
 #include "paint-funcs-types.h"
 
-#include "base/base-config.h"
 #include "base/pixel-processor.h"
 #include "base/pixel-region.h"
 #include "base/tile-manager.h"
@@ -39,6 +38,8 @@
 #include "paint-funcs-generic.h"
 #include "paint-funcs-mmx.h"
 
+#include "appenv.h"
+
 #define RANDOM_SEED        314159265
 #define EPSILON            0.0001
 

app/plug-in/gimpplugin-message.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/gimpplugin.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/gimppluginmanager-call.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/gimppluginmanager-run.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/gimppluginshm.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/plug-in-message.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/plug-in-run.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/plug-in-shm.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

app/plug-in/plug-in.c

@@ -107,6 +107,7 @@
 #include "plug-in-progress.h"
 #include "plug-in-rc.h"
 
+#include "appenv.h"
 #include "app_procs.h"
 #include "gimprc.h"
 
@@ -260,8 +261,6 @@ plug_in_init_shm (void)
 void
 plug_in_init (Gimp *gimp)
 {
-  extern gboolean use_shm;
-
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
   /* initialize the gimp protocol library and set the read and

docs/gimp-1.3.1.in

@@ -6,7 +6,7 @@ gimp - an image manipulation and paint program.
 [\-h] [\-\-help] [-v] [\-\-version] [\-b] [\-\-batch \fI<commands>\fP]
 [\-g] [\-\-gimprc \fI<gimprc>\fP] [\-n] [\-\-no\-interface] [\-r] 
 [\-\-restore\-session] [\-\-no\-data] [\-\-verbose] [\-\-no\-shm]
-[\-\-no\-xshm] [\-\-display \fIdisplay\fP] [\-\-no\-splash]
+[\-\-no\-mmx] [\-\-display \fIdisplay\fP] [\-\-no\-splash]
 [\-\-no\-splash\-image] [\-\-debug\-handlers] [\-\-console\-messages] 
 [\-\-system\-gimprc \fI<gimprc>\fP] [\fIfilename\fP]...
 
@@ -65,11 +65,8 @@ Do not use shared memory between GIMP and its plugins.
 Instead of using shared memory, GIMP will send the data via pipe. This
 will result in slower performance than using shared memory.
 .TP 8
-.B \-\-no\-xshm
+.B \-\-no\-mmx
-Do not use the X Shared Memory extension. If GIMP is being displayed
+Do not use MMX routines even if GIMP detects the availability of MMX.
-on a remote X server, this probably needs to be enabled. Also useful
-for any X server that doesn't properly support the X shared memory extension.
-This will result in slower performance than with X shared memory enabled.
 .TP 8
 .B \-\-display \fIdisplay\fP
 Use the designated X display.
@@ -114,6 +111,13 @@ first and the user gimprc can override the system settings.
 @sysconfdir@/gimprc_user is the default gimprc
 placed in users' home directories the first time gimp is run.
 
+\fB$HOME\fP/.gimp-1.3/devicerc - holds settings for input devices
+together with the tool, colors, brush, pattern and gradient 
+associated to that device.
+
+\fB$HOME\fP/@gimpdir@/documents - lists all images that have been 
+opened or saved using Gimp.
+
 \fB$HOME\fP/@gimpdir@/gtkrc - users set of gimp-specific GTK 
 config settings. Options such as widget color and fonts sizes 
 can be set here.
@@ -121,9 +125,6 @@ can be set here.
 @gimpsysconfdir@/gtkrc - sytem wide default set of gimp-specific 
 GTK config settings.
 
-\fB$HOME\fP/@gimpdir@/ideas - lists all images that have been 
-opened or saved using Gimp.
-
 \fB$HOME\fP/@gimpdir@/menurc - user's set of keybindings.
 
 @gimpsysconfdir@/menurc - system wide set of keybindings.

docs/gimp.1.in

@@ -6,7 +6,7 @@ gimp - an image manipulation and paint program.
 [\-h] [\-\-help] [-v] [\-\-version] [\-b] [\-\-batch \fI<commands>\fP]
 [\-g] [\-\-gimprc \fI<gimprc>\fP] [\-n] [\-\-no\-interface] [\-r] 
 [\-\-restore\-session] [\-\-no\-data] [\-\-verbose] [\-\-no\-shm]
-[\-\-no\-xshm] [\-\-display \fIdisplay\fP] [\-\-no\-splash]
+[\-\-no\-mmx] [\-\-display \fIdisplay\fP] [\-\-no\-splash]
 [\-\-no\-splash\-image] [\-\-debug\-handlers] [\-\-console\-messages] 
 [\-\-system\-gimprc \fI<gimprc>\fP] [\fIfilename\fP]...
 
@@ -65,11 +65,8 @@ Do not use shared memory between GIMP and its plugins.
 Instead of using shared memory, GIMP will send the data via pipe. This
 will result in slower performance than using shared memory.
 .TP 8
-.B \-\-no\-xshm
+.B \-\-no\-mmx
-Do not use the X Shared Memory extension. If GIMP is being displayed
+Do not use MMX routines even if GIMP detects the availability of MMX.
-on a remote X server, this probably needs to be enabled. Also useful
-for any X server that doesn't properly support the X shared memory extension.
-This will result in slower performance than with X shared memory enabled.
 .TP 8
 .B \-\-display \fIdisplay\fP
 Use the designated X display.
@@ -114,6 +111,13 @@ first and the user gimprc can override the system settings.
 @sysconfdir@/gimprc_user is the default gimprc
 placed in users' home directories the first time gimp is run.
 
+\fB$HOME\fP/.gimp-1.3/devicerc - holds settings for input devices
+together with the tool, colors, brush, pattern and gradient 
+associated to that device.
+
+\fB$HOME\fP/@gimpdir@/documents - lists all images that have been 
+opened or saved using Gimp.
+
 \fB$HOME\fP/@gimpdir@/gtkrc - users set of gimp-specific GTK 
 config settings. Options such as widget color and fonts sizes 
 can be set here.
@@ -121,9 +125,6 @@ can be set here.
 @gimpsysconfdir@/gtkrc - sytem wide default set of gimp-specific 
 GTK config settings.
 
-\fB$HOME\fP/@gimpdir@/ideas - lists all images that have been 
-opened or saved using Gimp.
-
 \fB$HOME\fP/@gimpdir@/menurc - user's set of keybindings.
 
 @gimpsysconfdir@/menurc - system wide set of keybindings.