Add new features to the config command for control of the config file:

- manipulate the autoexec section
- display information on sections and values
- show the used config files and startup command line parameters 
- restart capability
- save config files either in the config or program directory

git-svn-id: https://dosbox.svn.sf.net/svnroot/dosbox/dosbox/trunk@3651 67dff46e-583c-4055-8ee1-d6b00ecfda6c

Author: h-a-l-9000

README

@@ -622,7 +622,19 @@ VER set major_version [minor_version]
 
 
 CONFIG -writeconf filelocation
+CONFIG -writeconf
+CONFIG -wcp filelocation
+CONFIG -wcd
 CONFIG -writelang filelocation
+CONFIG -axadd
+CONFIG -axclear
+CONFIG -axtype
+CONFIG -r [parameters]
+CONFIG -l
+CONFIG -help
+CONFIG -help sections
+CONFIG -help section
+CONFIG -help section property
 CONFIG -securemode
 CONFIG -set "section property=value"
 CONFIG -get "section property"
@@ -633,20 +645,74 @@ CONFIG -get "section property"
   be found in Section 13: "The configuration (options) file".
 
   -writeconf filelocation
-     Write the current configuration settings to a file in a specified location.
-    "filelocation" is located on the local drive, not a mounted drive in DOSBox.
+     (or -wc filelocation)
+     Write the current configuration settings to a file in a specified location
+     relative to the DOSBox config directory. Relative and absolute paths are 
+     possible. "filelocation" is located on the local drive, not a mounted 
+     drive in DOSBox.
+     
      The configuration file controls various settings of DOSBox:
      the amount of emulated memory, the emulated sound cards and many more
      things. It allows access to AUTOEXEC.BAT as well.
      See Section 13: "The configuration (options) file" for more information.
 
+  -writeconf
+     (or -wc)
+     Write the configuration to the primary loaded config file.
+
+  -wcp filelocation
+     Write the current configuration settings to the specified file in or 
+     relative to the DOSBox program start directory. Realtive and absolute 
+     paths are possible. This is located on a drive on the host, not a mounted
+     drive in DOSBox. It is useful if you keep DOSBox on a removable media.
+     If file is omitted, the configuration will be written to dosbox.conf.
+     
+  -wcd
+     Write the current configuration to the default config file.
+        
+     
   -writelang filelocation
+     (or -wl filelocation)
      Write the current language settings to a file in a specified location.
      "filelocation" is located on the local drive, not a mounted drive
      in DOSBox. The language file controls all visible output of the internal
      commands and the internal DOS.
      See Section 14: "The Language File" for more information.
 
+  -axadd "line1" "line2" ...
+     Adds a command line to the autoexec section.
+
+  -axclear
+     Clears the autoexec section.
+     
+  -axtype
+     Prints the content of the autoexec section.
+
+  -r [parameters]
+     Restart DOSBox, either with the parameters that were used to start the
+     current instance or any that are appended.
+
+  -l 
+     lists DOSBox parameters:
+     - the configuration directory
+     - the config files that were used when starting this session
+     - the command line parameters DOSBox was started with
+
+  -h, -help, -?
+     Displays an overvie of the config commands.
+
+  -h, -help, -? sections
+     Displays the list of sections in the config file.
+  
+  -h, -help, -? section
+     Displays the list of properties contained in the specified section.
+     
+  -h, -help, -? section property
+     Shows information about the specified property in the specified section:
+     - purpose of the property
+     - possible values, current value, default value
+     - wether it can definitely not be changed at runtime
+       
   -securemode
      Switches DOSBox to a more secure mode. In this mode the internal
      commands MOUNT, IMGMOUNT and BOOT won't work. It's not possible either
@@ -655,7 +721,6 @@ CONFIG -get "section property"
 
   -set "section property=value"
      CONFIG will attempt to set the property to new value.
-     Currently CONFIG can not report whether the command succeeded or not.
 
   -get "section property"
      The current value of the property is reported and stored in the
@@ -675,7 +740,22 @@ CONFIG -get "section property"
         config -set "dos ems=false"
     4. To check which cpu core is being used.
         config -get "cpu core"
-
+    5. To view the list of possible cpu cores:
+        config -help cpu core
+    6. To change the machine type and restart:
+        config -set "machine cga"
+        config -wc -r
+    7. To configure the autoexec section to auto-mount a directory at start:
+        config -axadd "mount c c:\dosgames" "c:"
+        config -wc
+    8. To create a specific config file in the config directory:
+        config -set "dos ems=false"
+        config -set "cpu cycles=10000"
+        config -set "core dynamic"
+        config -axadd "mount c c:\dosgames" "c:" "cd my_game" "my_game"
+        config -wc my_config.conf
+    9. To restart DOSBox from a specific config file in the config directory:
+        config -r -conf my_config.conf
 
 LOADFIX [-size] [program] [program-parameters]
 LOADFIX -f
@@ -985,6 +1065,7 @@ CTRL-F10      Capture/Release the mouse.
 CTRL-F11      Slow down emulation (Decrease DOSBox Cycles).
 CTRL-F12      Speed up emulation (Increase DOSBox Cycles)*.
 ALT-F12       Unlock speed (turbo button/fast forward)**.
+CTRL-ALT-HOME Restart DOSBox.
 F11, ALT-F11  (machine=cga) change tint in NTSC output modes***
 F11           (machine=hercules) cycle through amber, green, white colouring***
 

include/control.h

@@ -63,7 +63,14 @@ class Config{
 	void (* _start_function)(void);
 	bool secure_mode; //Sandbox mode
 public:
-	Config(CommandLine * cmd):cmdline(cmd),secure_mode(false){}
+	bool initialised;
+	std::vector<std::string> startup_params;
+	std::vector<std::string> configfiles;
+	Config(CommandLine * cmd):cmdline(cmd),secure_mode(false) {
+		startup_params.push_back(cmdline->GetFileName());
+		cmdline->FillVector(startup_params);
+		initialised=false;
+	}
 	~Config();
 
 	Section_line * AddSection_line(char const * const _name,void (*_initfunction)(Section*));

include/cross.h

@@ -74,6 +74,7 @@ class Cross {
 	static void CreatePlatformConfigDir(std::string& in);
 	static void ResolveHomedir(std::string & temp_line);
 	static void CreateDir(std::string const& temp);
+	static bool Cross::IsPathAbsolute(std::string const& in);
 };
 
 

include/mapper.h

@@ -21,7 +21,7 @@
 
 enum MapKeys {
 	MK_f1,MK_f2,MK_f3,MK_f4,MK_f5,MK_f6,MK_f7,MK_f8,MK_f9,MK_f10,MK_f11,MK_f12,
-	MK_return,MK_kpminus,MK_scrolllock,MK_printscreen,MK_pause
+	MK_return,MK_kpminus,MK_scrolllock,MK_printscreen,MK_pause,MK_home
 
 };
 

include/programs.h

@@ -52,6 +52,8 @@ class CommandLine {
 	bool FindStringBegin(char const * const begin,std::string & value, bool remove=false);
 	bool FindStringRemain(char const * const name,std::string & value);
 	bool GetStringRemain(std::string & value);
+	int GetParameterFromList(const char* const params[], std::vector<std::string> & output);
+	void FillVector(std::vector<std::string> & vector);
 	unsigned int GetCount(void);
 	void Shift(unsigned int amount=1);
 	Bit16u Get_arglength();

include/setup.h

@@ -104,18 +104,18 @@ class Value {
 	operator int () const throw(WrongType);
 	operator double () const throw(WrongType);
 	operator char const* () const throw(WrongType);
-	void SetValue(std::string const& in,Etype _type = V_CURRENT) throw(WrongType);
+	bool SetValue(std::string const& in,Etype _type = V_CURRENT) throw(WrongType);
 	std::string ToString() const;
 
 private:
 	void destroy() throw();
 	Value& copy(Value const& in) throw(WrongType);
 	void plaincopy(Value const& in) throw();
-	void set_hex(std::string const& in);
-	void set_int(std::string const&in);
-	void set_bool(std::string const& in);
+	bool set_hex(std::string const& in);
+	bool set_int(std::string const&in);
+	bool set_bool(std::string const& in);
 	void set_string(std::string const& in);
-	void set_double(std::string const& in);
+	bool set_double(std::string const& in);
 };
 
 class Property {
@@ -127,18 +127,20 @@ class Property {
 	void Set_values(const char * const * in);
 	void Set_help(std::string const& str);
 	char const* Get_help();
-	virtual	void SetValue(std::string const& str)=0;
+	virtual	bool SetValue(std::string const& str)=0;
 	Value const& GetValue() const { return value;}
 	Value const& Get_Default_Value() const { return default_value; }
 	//CheckValue returns true  if value is in suggested_values;
 	//Type specific properties are encouraged to override this and check for type
 	//specific features.
 	virtual bool CheckValue(Value const& in, bool warn);
 	//Set interval value to in or default if in is invalid. force always sets the value.
-	void SetVal(Value const& in, bool forced,bool warn=true) {if(forced || CheckValue(in,warn)) value = in; else value = default_value;}
+	bool SetVal(Value const& in, bool forced,bool warn=true) {
+		if(forced || CheckValue(in,warn)) {value = in; return true;} else { value = default_value; return false;}}
 	virtual ~Property(){ } 
 	virtual const std::vector<Value>& GetValues() const;
 	Value::Etype Get_type(){return default_value.type;}
+	Changeable::Value getChange() {return change;}
 
 protected:
 	Value value;
@@ -161,8 +163,10 @@ class Prop_int:public Property {
 		min = _min;
 		max = _max;
 	}
+	int getMin() { return min;}
+	int getMax() { return max;}
 	void SetMinMax(Value const& min,Value const& max) {this->min = min; this->max=max;}
-	void SetValue(std::string const& in);
+	bool SetValue(std::string const& in);
 	~Prop_int(){ }
 	virtual bool CheckValue(Value const& in, bool warn);
 private:
@@ -175,7 +179,7 @@ class Prop_double:public Property {
 		:Property(_propname,when){
 		default_value = value = _value;
 	}
-	void SetValue(std::string const& input);
+	bool SetValue(std::string const& input);
 	~Prop_double(){ }
 };
 
@@ -185,7 +189,7 @@ class Prop_bool:public Property {
 		:Property(_propname,when) { 
 		default_value = value = _value;
 	}
-	void SetValue(std::string const& in);
+	bool SetValue(std::string const& in);
 	~Prop_bool(){ }
 };
 
@@ -195,7 +199,7 @@ class Prop_string:public Property{
 		:Property(_propname,when) { 
 		default_value = value = _value;
 	}
-	void SetValue(std::string const& in);
+	bool SetValue(std::string const& in);
 	virtual bool CheckValue(Value const& in, bool warn);
 	~Prop_string(){ }
 };
@@ -207,7 +211,7 @@ class Prop_path:public Prop_string{
 		default_value = value = _value;
 		realpath = _value;
 	}
-	void SetValue(std::string const& in);
+	bool SetValue(std::string const& in);
 	~Prop_path(){ }
 };
 
@@ -217,7 +221,7 @@ class Prop_hex:public Property {
 		:Property(_propname,when) { 
 		default_value = value = _value;
 	}
-	void SetValue(std::string const& in);
+	bool SetValue(std::string const& in);
 	~Prop_hex(){ }
 };
 
@@ -248,7 +252,7 @@ class Section {
 	const char* GetName() const {return sectionname.c_str();}
 
 	virtual std::string GetPropValue(std::string const& _property) const =0;
-	virtual void HandleInputline(std::string const& _line)=0;
+	virtual bool HandleInputline(std::string const& _line)=0;
 	virtual void PrintData(FILE* outfile) const =0;
 	virtual ~Section() { /*Children must call executedestroy ! */}
 };
@@ -281,7 +285,7 @@ class Section_prop:public Section {
 	Prop_path* Get_path(std::string const& _propname) const;
 	Prop_multival* Get_multival(std::string const& _propname) const;
 	Prop_multival_remain* Get_multivalremain(std::string const& _propname) const;
-	void HandleInputline(std::string const& gegevens);
+	bool HandleInputline(std::string const& gegevens);
 	void PrintData(FILE* outfile) const;
 	virtual std::string GetPropValue(std::string const& _property) const;
 	//ExecuteDestroy should be here else the destroy functions use destroyed properties
@@ -299,7 +303,7 @@ class Prop_multival:public Property{
 	}
 	Section_prop *GetSection() { return section; }
 	const Section_prop *GetSection() const { return section; }
-	virtual void SetValue(std::string const& input);
+	virtual bool SetValue(std::string const& input);
 	virtual const std::vector<Value>& GetValues() const;
 	~Prop_multival() { delete section; }
 }; //value bevat totale string. setvalue zet elk van de sub properties en checked die.
@@ -308,15 +312,15 @@ class Prop_multival_remain:public Prop_multival{
 public:
 	Prop_multival_remain(std::string const& _propname, Changeable::Value when,std::string const& sep):Prop_multival(_propname,when,sep){ }
 
-	virtual void SetValue(std::string const& input);
+	virtual bool SetValue(std::string const& input);
 };
 
 
 class Section_line: public Section{
 public:
 	Section_line(std::string const& _sectionname):Section(_sectionname){}
 	~Section_line(){ExecuteDestroy(true);}
-	void HandleInputline(std::string const& gegevens);
+	bool HandleInputline(std::string const& gegevens);
 	void PrintData(FILE* outfile) const;
 	virtual std::string GetPropValue(std::string const& _property) const;
 	std::string data;

src/debug/debug.cpp

@@ -2113,7 +2113,7 @@ void DEBUG_SetupConsole(void) {
 	DBGUI_StartUp();
 }
 
-static void DEBUG_ShutDown(Section * /*sec*/) {
+void DEBUG_ShutDown(Section * /*sec*/) {
 	CBreakpoint::DeleteAll();
 	CDebugVar::DeleteAll();
 	curs_set(old_cursor_state);

src/dosbox.cpp

@@ -340,7 +340,7 @@ void DOSBOX_Init(void) {
 
 	Pstring = secprop->Add_string("machine",Property::Changeable::OnlyAtStart,"svga_s3");
 	Pstring->Set_values(machines);
-	Pstring->Set_help("The type of machine tries to emulate.");
+	Pstring->Set_help("The type of machine DOSBox tries to emulate.");
 
 	Pstring = secprop->Add_path("captures",Property::Changeable::Always,"capture");
 	Pstring->Set_help("Directory where things like wave, midi, screenshot get captured.");
@@ -376,8 +376,8 @@ void DOSBOX_Init(void) {
 
 	Pmulti = secprop->Add_multi("scaler",Property::Changeable::Always," ");
 	Pmulti->SetValue("normal2x");
-	Pmulti->Set_help("Scaler used to enlarge/enhance low resolution modes.\n"
-	                 "  If 'forced' is appended, then the scaler will be used even if the result might not be desired.");
+	Pmulti->Set_help("Scaler used to enlarge/enhance low resolution modes. If 'forced' is appended,\n"
+	                 "then the scaler will be used even if the result might not be desired.");
 	Pstring = Pmulti->GetSection()->Add_string("type",Property::Changeable::Always,"normal2x");
 
 	const char *scalers[] = { 
@@ -403,7 +403,8 @@ void DOSBOX_Init(void) {
 		"normal", "simple",0 };
 	Pstring = secprop->Add_string("core",Property::Changeable::WhenIdle,"auto");
 	Pstring->Set_values(cores);
-	Pstring->Set_help("CPU Core used in emulation. auto will switch to dynamic if available and appropriate.");
+	Pstring->Set_help("CPU Core used in emulation. auto will switch to dynamic if available and\n"
+		"appropriate.");
 
 	const char* cputype_values[] = { "auto", "386", "386_slow", "486_slow", "pentium_slow", "386_prefetch", 0};
 	Pstring = secprop->Add_string("cputype",Property::Changeable::Always,"auto");
@@ -418,9 +419,10 @@ void DOSBOX_Init(void) {
 		"Cycles can be set in 3 ways:\n"
 		"  'auto'          tries to guess what a game needs.\n"
 		"                  It usually works, but can fail for certain games.\n"
-		"  'fixed #number' will set a fixed amount of cycles. This is what you usually need if 'auto' fails.\n"
-		"                  (Example: fixed 4000).\n"
-		"  'max'           will allocate as much cycles as your computer is able to handle.\n");
+		"  'fixed #number' will set a fixed amount of cycles. This is what you usually\n"
+		"                  need if 'auto' fails (Example: fixed 4000).\n"
+		"  'max'           will allocate as much cycles as your computer is able to\n"
+		"                  handle.");
 
 	const char* cyclest[] = { "auto","fixed","max","%u",0 };
 	Pstring = Pmulti_remain->GetSection()->Add_string("type",Property::Changeable::Always,"auto");
@@ -431,7 +433,7 @@ void DOSBOX_Init(void) {
 
 	Pint = secprop->Add_int("cycleup",Property::Changeable::Always,10);
 	Pint->SetMinMax(1,1000000);
-	Pint->Set_help("Amount of cycles to decrease/increase with keycombo.(CTRL-F11/CTRL-F12)");
+	Pint->Set_help("Amount of cycles to decrease/increase with keycombos.(CTRL-F11/CTRL-F12)");
 
 	Pint = secprop->Add_int("cycledown",Property::Changeable::Always,20);
 	Pint->SetMinMax(1,1000000);

src/gui/sdl_gui.cpp

@@ -40,7 +40,7 @@
 
 extern Bit8u int10_font_14[256 * 14];
 extern Program * first_shell;
-extern void MSG_Write(const char *);
+extern bool MSG_Write(const char *);
 extern void GFX_SetTitle(Bit32s cycles, Bits frameskip, bool paused);
 
 static int cursor, saved_bpp;