Mercurial > hg > octave-lyh
view 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 |
line wrap: on
line source
/* Copyright (C) 2002-2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_octave_h) #define octave_octave_h 1 #ifdef __cplusplus extern "C" { #endif extern OCTINTERP_API int octave_main (int argc, char **argv, int embedded); extern OCTINTERP_API void octave_process_command_line (int argc, char **argv); extern OCTINTERP_API void octave_initialize_interpreter (int argc, char **argv, int embedded); extern OCTINTERP_API int octave_execute_interpreter (void); extern OCTINTERP_API int octave_cmdline_argc; extern OCTINTERP_API char **octave_cmdline_argv; extern OCTINTERP_API int octave_embedded; extern OCTINTERP_API int octave_starting_gui (void); #ifdef __cplusplus } #endif #endif