diff -Naur Scilab-3.0-RC1/routines/gtksci/x_main.c Scilab-3.0-RC1-nc/routines/gtksci/x_main.c --- Scilab-3.0-RC1/routines/gtksci/x_main.c 2004-03-10 07:25:44.000000000 -0500 +++ Scilab-3.0-RC1-nc/routines/gtksci/x_main.c 2004-05-18 16:50:38.000000000 -0400 @@ -94,6 +94,7 @@ if ( strcmp(argv[i],"-nw") == 0) { no_window = 1; } else if ( strcmp(argv[i],"-nwni") == 0) { no_window = 1; } + else if ( strcmp(argv[i],"-nc") == 0) { no_window = 2; } else if ( strcmp(argv[i],"-display") == 0) { display = argv[++i];} else if ( strcmp(argv[i],"-ns") == 0) { no_startup_flag = 1; } else if ( strcmp(argv[i],"-nb") == 0) { sci_show_banner = 0; } @@ -147,7 +148,10 @@ create_scilab_status(); */ SetXsciOn(); - } + } else if (no_window == 2) { + gtk_init(&argc,&argv); + SetXsciOn(); + } /* signals */ signal(SIGINT,sci_clear_and_exit); signal(SIGBUS,sci_clear_and_exit); @@ -354,7 +358,9 @@ } options[] = { { "-help", "print out this message" }, { "-ns", "no startup mode " }, -{ "-nw", "no window mode " }, +{ "-nw", "text mode (no graphics)" }, +{ "-nwni", "text mode also" }, +{ "-nc", "no gui command window" }, { "-display displayname", "X server to contact" }, { "-name string", "client instance, icon, and title strings" }, { "-xrm resourcestring", "additional resource specifications" }, diff -Naur Scilab-3.0-RC1/routines/xsci/jpc_inter.c Scilab-3.0-RC1-nc/routines/xsci/jpc_inter.c --- Scilab-3.0-RC1/routines/xsci/jpc_inter.c 2004-02-11 12:38:39.000000000 -0500 +++ Scilab-3.0-RC1-nc/routines/xsci/jpc_inter.c 2004-05-18 16:49:22.000000000 -0400 @@ -177,9 +177,17 @@ register int i; static struct timeval select_timeout; static int state=0; + extern int TK_Started; if ( BasicScilab) return(getchar()); for( ; ; ) { + #ifdef WITH_TK + if (TK_Started) flushTKEvents(); + #endif + usleep(1); XFlush(the_dpy); /* always flush writes before waiting */ + + if (interrupt&&(C2F(ismenu)()==1)) return(-1); + /* Update the masks and, unless X events are already in the queue, wait for I/O to be possible. */ select_mask = Select_mask; diff -Naur Scilab-3.0-RC1/routines/xsci/x_main.c Scilab-3.0-RC1-nc/routines/xsci/x_main.c --- Scilab-3.0-RC1/routines/xsci/x_main.c 2004-04-22 09:09:37.000000000 -0400 +++ Scilab-3.0-RC1-nc/routines/xsci/x_main.c 2004-05-18 16:49:29.000000000 -0400 @@ -135,6 +135,8 @@ { if ( strcmp(argv[i],"-nw") == 0) { no_window = 1; } + if ( strcmp(argv[i],"-nc") == 0) + { no_window = 2; } if ( strcmp(argv[i],"-nwni") == 0) { no_window = 1; } else if ( strcmp(argv[i],"-display") == 0) @@ -218,6 +220,9 @@ { /* initialize scilab interp */ C2F(inisci)(&ini, &memory, &ierr); + if (no_window==2) { + inittk(); + } if (ierr > 0) sci_exit(1) ; /* execute the initial script and enter scilab */ C2F(scirun)(startup,strlen(startup)); @@ -303,8 +308,9 @@ } options[] = { { "-help", "print out this message" }, { "-ns", "no startup mode " }, - { "-nw", "no window mode " }, - { "-nwni", "no window mode also" }, + { "-nw", "text mode (no graphics)" }, + { "-nwni", "text mode also" }, + { "-nc", "no gui command window" }, { "-display displayname", "X server to contact" }, { "-name string", "client instance, icon, and title strings" }, { "-xrm resourcestring", "additional resource specifications" }, diff -Naur Scilab-3.0-RC1/scilab.star Scilab-3.0-RC1-nc/scilab.star --- Scilab-3.0-RC1/scilab.star 2004-04-09 11:06:35.000000000 -0400 +++ Scilab-3.0-RC1-nc/scilab.star 2004-05-18 16:51:15.000000000 -0400 @@ -100,7 +100,7 @@ // Menu for Help and editor =========================================== if grep(args,'scilex')<>[] then - if (args<>"-nw")&(args<>"-nwni")&(args<>"--texmacs") then + if (args<>"-nc")&(args<>"-nw")&(args<>"-nwni")&(args<>"--texmacs") then delmenu("Help") if ~MSDOS then addmenu("Help",["Help browser","Apropos","Configure"],list(2,"help_menu")), diff -Naur Scilab-3.0-RC1/scripts/scilab.g.in Scilab-3.0-RC1-nc/scripts/scilab.g.in --- Scilab-3.0-RC1/scripts/scilab.g.in 2003-10-17 09:15:01.000000000 -0400 +++ Scilab-3.0-RC1-nc/scripts/scilab.g.in 2004-05-18 16:53:58.000000000 -0400 @@ -59,9 +59,9 @@ do_help() { echo "Usage:" -echo " scilab [-ns -nw -nb -display display -f file -l lang -args arguments]" -echo " scilab [-ns -nw -nb -display display -e expression -l lang -args arguments]" -echo " scilab -link " +echo " scilab [-ns -nw -nc -nb -display display -f file -l lang -args arguments]" +echo " scilab [-ns -nw -nc -nb -display display -e expression -l lang -args arguments]" +echo " scilab -link " exit } @@ -238,6 +238,10 @@ now="-nw" sci_args="$sci_args -nw" ;; + -nc) + now="-nc" + sci_args="$sci_args -nc" + ;; --texmacs) now="-nw" sci_args="$sci_args --texmacs" diff -Naur Scilab-3.0-RC1/scripts/scilab-gtk.g.in Scilab-3.0-RC1-nc/scripts/scilab-gtk.g.in --- Scilab-3.0-RC1/scripts/scilab-gtk.g.in 2003-09-24 07:51:14.000000000 -0400 +++ Scilab-3.0-RC1-nc/scripts/scilab-gtk.g.in 2004-05-18 16:53:55.000000000 -0400 @@ -38,8 +38,8 @@ do_help() { echo "Usage:" -echo " scilab [-ns -nw -nb -display display -f file -l lang -args arguments]" -echo " scilab [-ns -nw -nb -display display -e expression -l lang -args arguments]" +echo " scilab [-ns -nw -nc -nb -display display -f file -l lang -args arguments]" +echo " scilab [-ns -nw -nc -nb -display display -e expression -l lang -args arguments]" echo " scilab -link " exit } @@ -218,6 +218,10 @@ now="-nw" sci_args="$sci_args -nw" ;; + -nc) + now="-nc" + sci_args="$sci_args -nc" + ;; --texmacs) now="-nw" sci_args="$sci_args -nw --texmacs"