Mercurial > octave-nkf
comparison 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 |
comparison
equal
deleted
inserted
replaced
15223:6ec6ddebb1a6 | 15224:a44e4a08fc55 |
---|---|
27 extern "C" { | 27 extern "C" { |
28 #endif | 28 #endif |
29 | 29 |
30 extern OCTINTERP_API int octave_main (int argc, char **argv, int embedded); | 30 extern OCTINTERP_API int octave_main (int argc, char **argv, int embedded); |
31 | 31 |
32 extern OCTINTERP_API void octave_process_command_line (int argc, char **argv); | |
33 | |
32 extern OCTINTERP_API void | 34 extern OCTINTERP_API void |
33 octave_initialize_interpreter (int argc, char **argv, int embedded); | 35 octave_initialize_interpreter (int argc, char **argv, int embedded); |
34 | 36 |
35 extern OCTINTERP_API int octave_execute_interpreter (void); | 37 extern OCTINTERP_API int octave_execute_interpreter (void); |
36 | 38 |