Mercurial > hg > octave-nkf
annotate libinterp/octave.h @ 15224:a44e4a08fc55
perform fewer actions before starting GUI
* octave.cc (forced_line_editing, read_history_file,
command_line_path, echo_executing_commands, doc_cache_file, exec_path,
image_path, info_file, info_program, no_window_system,
texi_macros_file): New file-scope static variables.
(octave_process_command_line): New function.
Process command line and set octave_cmdline_argc, octave_cmdline_argv,
forced_line_editing, and read_history_file here, not in
octave_initialize_interpreter.
(octave_initialize_interpreter): Perform actions for command line
options here instead of in command option processing loop in
octave_process_command_line.
(octave_main): Call octave_process_command_line.
* octave.h (octave_process_command_line): Provide decl.
* main.cc, main-cli.cc (main): Call octave_process_command_line.
* main.cc (main): If not starting GUI, call
octave_initialize_interpreter before calling
octave_execute_interpreter.
* main-cli.cc (main): Call octave_initialize_interpreter before
calling octave_execute_interpreter.
* octave-main-thread.cc (octave_main_thread::run): Likewise.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 23 Aug 2012 17:53:42 -0400 |
parents | 2fc554ffbc28 |
children | 1b388d922e6b |
rev | line source |
---|---|
4113 | 1 /* |
2 | |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 2002-2012 John W. Eaton |
4113 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
4113 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
4113 | 20 |
21 */ | |
22 | |
23 #if !defined (octave_octave_h) | |
24 #define octave_octave_h 1 | |
25 | |
10313 | 26 #ifdef __cplusplus |
4113 | 27 extern "C" { |
28 #endif | |
29 | |
6109 | 30 extern OCTINTERP_API int octave_main (int argc, char **argv, int embedded); |
4113 | 31 |
15224
a44e4a08fc55
perform fewer actions before starting GUI
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
32 extern OCTINTERP_API void octave_process_command_line (int argc, char **argv); |
a44e4a08fc55
perform fewer actions before starting GUI
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
33 |
15137
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
34 extern OCTINTERP_API void |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
35 octave_initialize_interpreter (int argc, char **argv, int embedded); |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
36 |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
37 extern OCTINTERP_API int octave_execute_interpreter (void); |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
38 |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
39 extern OCTINTERP_API int octave_cmdline_argc; |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
40 extern OCTINTERP_API char **octave_cmdline_argv; |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
41 extern OCTINTERP_API int octave_embedded; |
16a6b0a6855d
GUI: support for octave arguments and integrate with run-octave.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
42 |
15139
bfc220d1de67
include gui in default Octave binary
John W. Eaton <jwe@octave.org>
parents:
15137
diff
changeset
|
43 extern OCTINTERP_API int octave_starting_gui (void); |
bfc220d1de67
include gui in default Octave binary
John W. Eaton <jwe@octave.org>
parents:
15137
diff
changeset
|
44 |
10313 | 45 #ifdef __cplusplus |
4113 | 46 } |
47 #endif | |
48 | |
49 #endif |