Attachment #31797 for bug #51664

View | Details | Raw Unified | Return to bug 51664
Collapse All | Expand All

Lines 94-99 Link Here

(-)Scilab-3.0-RC1/routines/gtksci/x_main.c (-2 / +8 lines)
94		94
95	if ( strcmp(argv[i],"-nw") == 0) { no_window = 1; }	95	if ( strcmp(argv[i],"-nw") == 0) { no_window = 1; }
96	else if ( strcmp(argv[i],"-nwni") == 0) { no_window = 1; }	96	else if ( strcmp(argv[i],"-nwni") == 0) { no_window = 1; }
		97	else if ( strcmp(argv[i],"-nc") == 0) { no_window = 2; }
97	else if ( strcmp(argv[i],"-display") == 0) { display = argv[++i];}	98	else if ( strcmp(argv[i],"-display") == 0) { display = argv[++i];}
98	else if ( strcmp(argv[i],"-ns") == 0) { no_startup_flag = 1; }	99	else if ( strcmp(argv[i],"-ns") == 0) { no_startup_flag = 1; }
99	else if ( strcmp(argv[i],"-nb") == 0) { sci_show_banner = 0; }	100	else if ( strcmp(argv[i],"-nb") == 0) { sci_show_banner = 0; }
Lines 147-153 Link Here
147	create_scilab_status();	148	create_scilab_status();
148	*/	149	*/
149	SetXsciOn();	150	SetXsciOn();
150	}	151	} else if (no_window == 2) {
		152	gtk_init(&argc,&argv);
		153	SetXsciOn();
		154	}
151	/* signals */	155	/* signals */
152	signal(SIGINT,sci_clear_and_exit);	156	signal(SIGINT,sci_clear_and_exit);
153	signal(SIGBUS,sci_clear_and_exit);	157	signal(SIGBUS,sci_clear_and_exit);
Lines 354-360 Link Here
354	} options[] = {	358	} options[] = {
355	{ "-help", "print out this message" },	359	{ "-help", "print out this message" },
356	{ "-ns", "no startup mode " },	360	{ "-ns", "no startup mode " },
357	{ "-nw", "no window mode " },	361	{ "-nw", "text mode (no graphics)" },
		362	{ "-nwni", "text mode also" },
		363	{ "-nc", "no gui command window" },
358	{ "-display displayname", "X server to contact" },	364	{ "-display displayname", "X server to contact" },
359	{ "-name string", "client instance, icon, and title strings" },	365	{ "-name string", "client instance, icon, and title strings" },
360	{ "-xrm resourcestring", "additional resource specifications" },	366	{ "-xrm resourcestring", "additional resource specifications" },

Lines 177-185 Link Here

(-)Scilab-3.0-RC1/routines/xsci/jpc_inter.c (+8 lines)
177	register int i;	177	register int i;
178	static struct timeval select_timeout;	178	static struct timeval select_timeout;
179	static int state=0;	179	static int state=0;
		180	extern int TK_Started;
180	if ( BasicScilab) return(getchar());	181	if ( BasicScilab) return(getchar());
181	for( ; ; ) {	182	for( ; ; ) {
		183	#ifdef WITH_TK
		184	if (TK_Started) flushTKEvents();
		185	#endif
		186	usleep(1);
182	XFlush(the_dpy); /* always flush writes before waiting */	187	XFlush(the_dpy); /* always flush writes before waiting */
		188
		189	if (interrupt&&(C2F(ismenu)()==1)) return(-1);
		190
183	/* Update the masks and, unless X events are already in the queue,	191	/* Update the masks and, unless X events are already in the queue,
184	wait for I/O to be possible. */	192	wait for I/O to be possible. */
185	select_mask = Select_mask;	193	select_mask = Select_mask;

Lines 135-140 Link Here

(-)Scilab-3.0-RC1/routines/xsci/x_main.c (-2 / +8 lines)
135	{	135	{
136	if ( strcmp(argv[i],"-nw") == 0)	136	if ( strcmp(argv[i],"-nw") == 0)
137	{ no_window = 1; }	137	{ no_window = 1; }
		138	if ( strcmp(argv[i],"-nc") == 0)
		139	{ no_window = 2; }
138	if ( strcmp(argv[i],"-nwni") == 0)	140	if ( strcmp(argv[i],"-nwni") == 0)
139	{ no_window = 1; }	141	{ no_window = 1; }
140	else if ( strcmp(argv[i],"-display") == 0)	142	else if ( strcmp(argv[i],"-display") == 0)
Lines 218-223 Link Here
218	{	220	{
219	/* initialize scilab interp */	221	/* initialize scilab interp */
220	C2F(inisci)(&ini, &memory, &ierr);	222	C2F(inisci)(&ini, &memory, &ierr);
		223	if (no_window==2) {
		224	inittk();
		225	}
221	if (ierr > 0) sci_exit(1) ;	226	if (ierr > 0) sci_exit(1) ;
222	/* execute the initial script and enter scilab */	227	/* execute the initial script and enter scilab */
223	C2F(scirun)(startup,strlen(startup));	228	C2F(scirun)(startup,strlen(startup));
Lines 303-310 Link Here
303	} options[] = {	308	} options[] = {
304	{ "-help", "print out this message" },	309	{ "-help", "print out this message" },
305	{ "-ns", "no startup mode " },	310	{ "-ns", "no startup mode " },
306	{ "-nw", "no window mode " },	311	{ "-nw", "text mode (no graphics)" },
307	{ "-nwni", "no window mode also" },	312	{ "-nwni", "text mode also" },
		313	{ "-nc", "no gui command window" },
308	{ "-display displayname", "X server to contact" },	314	{ "-display displayname", "X server to contact" },
309	{ "-name string", "client instance, icon, and title strings" },	315	{ "-name string", "client instance, icon, and title strings" },
310	{ "-xrm resourcestring", "additional resource specifications" },	316	{ "-xrm resourcestring", "additional resource specifications" },

Lines 100-106 Link Here

(-)Scilab-3.0-RC1/scilab.star (-1 / +1 lines)
100		100
101	// Menu for Help and editor ===========================================	101	// Menu for Help and editor ===========================================
102	if grep(args,'scilex')<>[] then	102	if grep(args,'scilex')<>[] then
103	if (args<>"-nw")&(args<>"-nwni")&(args<>"--texmacs") then	103	if (args<>"-nc")&(args<>"-nw")&(args<>"-nwni")&(args<>"--texmacs") then
104	delmenu("Help")	104	delmenu("Help")
105	if ~MSDOS then	105	if ~MSDOS then
106	addmenu("Help",["Help browser","Apropos","Configure"],list(2,"help_menu")),	106	addmenu("Help",["Help browser","Apropos","Configure"],list(2,"help_menu")),

Lines 59-67 Link Here

(-)Scilab-3.0-RC1/scripts/scilab.g.in (-3 / +7 lines)
59	do_help()	59	do_help()
60	{	60	{
61	echo "Usage:"	61	echo "Usage:"
62	echo " scilab [-ns -nw -nb -display display -f file -l lang -args arguments]"	62	echo " scilab [-ns -nw -nc -nb -display display -f file -l lang -args arguments]"
63	echo " scilab [-ns -nw -nb -display display -e expression -l lang -args arguments]"	63	echo " scilab [-ns -nw -nc -nb -display display -e expression -l lang -args arguments]"
64	echo " scilab -link <objects>"	64	echo " scilab -link <objects>"
65	exit	65	exit
66	}	66	}
67		67
Lines 238-243 Link Here
238	now="-nw"	238	now="-nw"
239	sci_args="$sci_args -nw"	239	sci_args="$sci_args -nw"
240	;;	240	;;
		241	-nc)
		242	now="-nc"
		243	sci_args="$sci_args -nc"
		244	;;
241	--texmacs)	245	--texmacs)
242	now="-nw"	246	now="-nw"
243	sci_args="$sci_args --texmacs"	247	sci_args="$sci_args --texmacs"

Lines 38-45 Link Here

(-)Scilab-3.0-RC1/scripts/scilab-gtk.g.in (-2 / +6 lines)
38	do_help()	38	do_help()
39	{	39	{
40	echo "Usage:"	40	echo "Usage:"
41	echo " scilab [-ns -nw -nb -display display -f file -l lang -args arguments]"	41	echo " scilab [-ns -nw -nc -nb -display display -f file -l lang -args arguments]"
42	echo " scilab [-ns -nw -nb -display display -e expression -l lang -args arguments]"	42	echo " scilab [-ns -nw -nc -nb -display display -e expression -l lang -args arguments]"
43	echo " scilab -link <objects>"	43	echo " scilab -link <objects>"
44	exit	44	exit
45	}	45	}
Lines 218-223 Link Here
218	now="-nw"	218	now="-nw"
219	sci_args="$sci_args -nw"	219	sci_args="$sci_args -nw"
220	;;	220	;;
		221	-nc)
		222	now="-nc"
		223	sci_args="$sci_args -nc"
		224	;;
221	--texmacs)	225	--texmacs)
222	now="-nw"	226	now="-nw"
223	sci_args="$sci_args -nw --texmacs"	227	sci_args="$sci_args -nw --texmacs"

Return to bug 51664