disable fflush in sci_printf only in webmode

Change-Id: I74a95e595d56dce51c4fa9ed2a0a376b08c7d6d6

diff --git a/scilab/modules/ast/includes/system_env/configvariable.hxx b/scilab/modules/ast/includes/system_env/configvariable.hxx
index 040a3ad..81be2ed 100644 (file)
--- a/scilab/modules/ast/includes/system_env/configvariable.hxx
+++ b/scilab/modules/ast/includes/system_env/configvariable.hxx
@@ -530,6 +530,12 @@ public :
     static void resetRecursionLevel();
     static bool increaseRecursion();
     static void decreaseRecursion();
+private: 
+    static bool webMode;
+public:
+    static bool getWebMode();
+    static void setWebMode(bool);
+
 };
 
 #endif /* !__CONFIGVARIABLE_HXX__ */

diff --git a/scilab/modules/ast/includes/system_env/configvariable_interface.h b/scilab/modules/ast/includes/system_env/configvariable_interface.h
index 6da2b86..0b52408 100644 (file)
--- a/scilab/modules/ast/includes/system_env/configvariable_interface.h
+++ b/scilab/modules/ast/includes/system_env/configvariable_interface.h
@@ -87,4 +87,7 @@ EXTERN_AST void setExecutionBreak();
 EXTERN_AST void resetExecutionBreak();
 
 EXTERN_AST int setRecursionLimit(int);
+
+EXTERN_AST int getWebMode();
 #endif /* !__CONFIGVARIABLE_INTERFACE_H__ */
+

diff --git a/scilab/modules/ast/src/cpp/system_env/configvariable.cpp b/scilab/modules/ast/src/cpp/system_env/configvariable.cpp
index 4bd03e0..89c746a 100644 (file)
--- a/scilab/modules/ast/src/cpp/system_env/configvariable.cpp
+++ b/scilab/modules/ast/src/cpp/system_env/configvariable.cpp
@@ -1602,3 +1602,16 @@ void ConfigVariable::resetRecursionLevel()
 {
     recursionLevel = 0;
 }
+
+//webmode
+bool ConfigVariable::webMode = true;
+
+bool ConfigVariable::getWebMode()
+{
+    return webMode;
+}
+
+void ConfigVariable::setWebMode(bool _mode)
+{
+    webMode = _mode;
+}

diff --git a/scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp b/scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp
index 41da8f0..bb38085 100644 (file)
--- a/scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp
+++ b/scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp
@@ -265,3 +265,9 @@ int setRecursionLimit(int val)
 {
     return ConfigVariable::setRecursionLimit(val);
 }
+
+int getWebMode()
+{
+    return ConfigVariable::getWebMode() ? 1 : 0;
+}
+

diff --git a/scilab/modules/core/src/cpp/InitScilab.cpp b/scilab/modules/core/src/cpp/InitScilab.cpp
index d3cfae7..3b132cc 100644 (file)
--- a/scilab/modules/core/src/cpp/InitScilab.cpp
+++ b/scilab/modules/core/src/cpp/InitScilab.cpp
@@ -251,6 +251,8 @@ int StartScilabEngine(ScilabEngineInfo* _pSEI)
     createInnosetupMutex();
 #endif
 
+    ConfigVariable::setWebMode(_pSEI->iWebMode != 0);
+
     //open scope lvl 0 for gateway from modules and first variables ( SCI, HOME, TMPDIR, ...)
     symbol::Context::getInstance()->scope_begin();
 
@@ -273,7 +275,7 @@ int StartScilabEngine(ScilabEngineInfo* _pSEI)
     {
         InitializeTclTk();
         InitializeJVM();
-        InitializeGUI(_pSEI->iWebMode == 0 ? TRUE : FALSE);
+        InitializeGUI();
 
         /* create needed data structure if not already created */
         loadGraphicModule();

diff --git a/scilab/modules/gui/includes/InitializeGUI.h b/scilab/modules/gui/includes/InitializeGUI.h
index 46b259b..88af486 100644 (file)
--- a/scilab/modules/gui/includes/InitializeGUI.h
+++ b/scilab/modules/gui/includes/InitializeGUI.h
@@ -18,7 +18,7 @@
 #include "BOOL.h"
 #include "dynlib_gui.h"
 
-GUI_IMPEXP BOOL InitializeGUI(BOOL);
+GUI_IMPEXP BOOL InitializeGUI();
 
 #endif /* __INTIALIZEGUI_H__ */
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/gui/src/cpp/InitializeGUI.cpp b/scilab/modules/gui/src/cpp/InitializeGUI.cpp
index fab212e..5d5309b 100644 (file)
--- a/scilab/modules/gui/src/cpp/InitializeGUI.cpp
+++ b/scilab/modules/gui/src/cpp/InitializeGUI.cpp
@@ -25,7 +25,7 @@ extern "C"
 #endif
 }
 /*--------------------------------------------------------------------------*/
-BOOL InitializeGUI(BOOL swingView)
+BOOL InitializeGUI()
 {
     if (getScilabMode() == SCILAB_STD)
     {
@@ -36,10 +36,11 @@ BOOL InitializeGUI(BOOL swingView)
     }
     else
     {
-        if (swingView)
+        if (getWebMode() == 0)
         {
             org_scilab_modules_gui_bridge::CallScilabBridge::registerSwingView(getScilabJavaVM());
         }
+
         return TRUE;
     }
 

diff --git a/scilab/modules/output_stream/sci_gateway/cpp/sci_mprintf.cpp b/scilab/modules/output_stream/sci_gateway/cpp/sci_mprintf.cpp
index da7c950..ac3a122 100644 (file)
--- a/scilab/modules/output_stream/sci_gateway/cpp/sci_mprintf.cpp
+++ b/scilab/modules/output_stream/sci_gateway/cpp/sci_mprintf.cpp
@@ -21,6 +21,7 @@
 #include "function.hxx"
 #include "string.hxx"
 #include "overload.hxx"
+#include "configvariable.hxx"
 
 #include <iterator>
 
@@ -78,7 +79,11 @@ types::Callable::ReturnValue sci_mprintf(types::typed_list &in, int _iRetCount,
 
         scilabForcedWriteW(pwstOutput[i]);
 
-        // fflush(NULL);
+        if (ConfigVariable::getWebMode() == false)
+        {
+            fflush(NULL);
+        }
+
         FREE(pwstOutput[i]);
     }