suppressed the horrible TO_SCREEN TO_FILE

Common/Context.h

@@ -72,7 +72,6 @@ public :
 
   int db;                     // double buffer? 
   int overlay;                // overlay graphic window? 
-  int stream;                 // output stream: TO_SCREEN or TO_FILE 
   int ortho;                  // orthogonal projection? 
   int fast;                   // inhibit mesh and postpro drawing when changing r,s,t 
   int command_win;            // command window? 

Common/Options.cpp

-// $Id: Options.cpp,v 1.63 2001-11-19 13:43:33 geuzaine Exp $
+// $Id: Options.cpp,v 1.64 2001-11-19 13:48:19 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -78,7 +78,6 @@ void Init_Options(int num){
   CTX.mesh.initial_only = 0 ;
   CTX.output_filename = NULL ;
   CTX.expose = 0 ;
-  CTX.stream = TO_SCREEN ;
   CTX.lc = 1.0 ;
   CTX.viewport[0] = CTX.viewport[1] = 0 ;
   CTX.min[0] = CTX.min[1] = CTX.min[2] = 0.0 ;

Fltk/Opengl.cpp

-// $Id: Opengl.cpp,v 1.25 2001-11-19 13:43:33 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.26 2001-11-19 13:48:19 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -57,6 +57,7 @@ void Draw_String(char *s){
     gl_draw(s);
   }
   else{ // ps, pstex or jpegtex output
+    if(CTX.print.format == FORMAT_JPEGTEX) return;
     gl2psText(s,CTX.print.eps_font,CTX.print.eps_font_size);
   }
 }

Graphics/CreateFile.cpp

-// $Id: CreateFile.cpp,v 1.25 2001-11-19 13:43:33 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.26 2001-11-19 13:48:19 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -162,11 +162,9 @@ void CreateOutputFile (char *name, int format) {
 		     (CTX.print.eps_background ? GL2PS_DRAW_BACKGROUND : 0) |
 		     (format==FORMAT_PSTEX ? GL2PS_NO_TEXT : 0),
 		     GL_RGBA, 0, NULL, size3d, fp, name);
-      CTX.stream = TO_FILE ;
       CTX.print.gl_fonts = 0;
       FillBuffer();
       CTX.print.gl_fonts = 1;
-      CTX.stream = TO_SCREEN ;
       res = gl2psEndPage();
     }
     Msg(INFO, "EPS creation complete '%s'", name);
@@ -182,11 +180,9 @@ void CreateOutputFile (char *name, int format) {
     gl2psBeginPage(CTX.base_filename, "Gmsh", 
 		   GL2PS_TEX, GL2PS_NO_SORT, 0, 
 		   GL_RGBA, 0, NULL, 1, fp, name);
-    CTX.stream = TO_FILE ;
     CTX.print.gl_fonts = 0;
     FillBuffer();
     CTX.print.gl_fonts = 1;
-    CTX.stream = TO_SCREEN ;
     res = gl2psEndPage();
     Msg(INFO, "TEX creation complete '%s'", name);
     Msg(STATUS2, "Wrote '%s'", name);

Graphics/Draw.h

@@ -9,9 +9,6 @@
 
 #define SELECTION_BUFFER_SIZE  1024
 
-#define TO_SCREEN  1
-#define TO_FILE    2
-
 void InitOpengl(void);
 void InitOverlay(void);
 void InitShading(void);