03c9a235b5
- rework the order of initialization with and without the control panel.
The thing that was bothering me most was the command line options were
being processed after the user had set everything in the control panel.
This is clearly not what's expected--the command line options should
affect the startup defaults of the control panel, but whatever the user
chooses in the cpanel menus is the final choice.
- if the control panel (config interface) is not wanted, the user can
put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command
line. Also, the "-psn" option which is automatically passed in by
MacOS X when you doubleclick the application causes the control panel
to be disabled. In this case, the order of operations is:
1. read bochsrc
2. parse command line options.
- if the control panel is enabled (default), the command line options are
parsed to provide the startup defaults for the control panel, but the
control panel settings are the final answer. So the order is:
1. parse command line options
2. run control panel (if user chooses, he can read bochsrc from menus)
- I haven't tested command line options with the debugger yet.
22 lines
597 B
C
22 lines
597 B
C
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: control.h,v 1.6 2001-10-06 22:31:31 bdenney Exp $
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
enum {
|
|
BX_CPANEL_INIT,
|
|
BX_CPANEL_START_MENU,
|
|
BX_CPANEL_START_OPTS,
|
|
BX_CPANEL_START_OPTS_MEM,
|
|
BX_CPANEL_START_OPTS_INTERFACE,
|
|
BX_CPANEL_START_OPTS_DISK,
|
|
BX_CPANEL_START_OPTS_SOUND,
|
|
BX_CPANEL_START_OPTS_MISC,
|
|
BX_CPANEL_RUNTIME,
|
|
BX_CPANEL_N_MENUS
|
|
};
|
|
|
|
/* special return value from bx_control_panel */
|
|
#define BX_DISABLE_CONTROL_PANEL 10
|
|
|
|
int bx_control_panel (int menu);
|