3 files changed, 330 insertions, 16 deletions

diff --git a/src/extras/frontendoption.cpp b/src/extras/frontendoption.cpp
index b365a3fe..ed8aa2a9 100644
--- a/src/extras/frontendoption.cpp
+++ b/src/extras/frontendoption.cpp
@@ -213,10 +213,10 @@ void FrontendOptionAddBuiltinAction(const wchar* leftText, int action, ButtonPre
 	TextCopy(option.leftText, leftText);
 	option.screenOptionOrder = screenOptionOrder;
 	option.returnPrevPageFunc = returnPrevPageFunc;
-	option.save = false;
+	option.save = nil;
 }
 
-void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, int8 numRightTexts, int8 *var, bool onlyApplyOnEnter, ChangeFunc changeFunc, ReturnPrevPageFunc returnPrevPageFunc, bool save)
+void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, int8 numRightTexts, int8 *var, bool onlyApplyOnEnter, ChangeFunc changeFunc, ReturnPrevPageFunc returnPrevPageFunc, const char* saveName)
 {
 	int8 screenOptionOrder = RegisterNewOption();
 
@@ -229,14 +229,14 @@ void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, in
 	option.value = var;
 	option.displayedValue = *var;
 	option.lastSavedValue = *var;
-	option.save = save;
+	option.save = saveName;
 	option.onlyApplyOnEnter = onlyApplyOnEnter;
 	option.changeFunc = changeFunc;
 	option.screenOptionOrder = screenOptionOrder;
 	option.returnPrevPageFunc = returnPrevPageFunc;
 }
 
-void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc drawFunc, int8 *var, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc, bool save)
+void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc drawFunc, int8 *var, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc, const char* saveName)
 {
 	int8 screenOptionOrder = RegisterNewOption();
 
@@ -246,7 +246,7 @@ void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc drawFunc, int8 *va
 	option.buttonPressFunc = buttonPressFunc;
 	TextCopy(option.leftText, leftText);
 	option.value = var;
-	option.save = save;
+	option.save = saveName;
 	option.screenOptionOrder = screenOptionOrder;
 	option.returnPrevPageFunc = returnPrevPageFunc;
 }
@@ -263,7 +263,7 @@ void FrontendOptionAddRedirect(const wchar* text, int to, int8 selectedOption, b
 	TextCopy(option.leftText, text);
 	option.screenOptionOrder = screenOptionOrder;
 	option.returnPrevPageFunc = nil;
-	option.save = false;
+	option.save = nil;
 }
 
 void FrontendOptionAddBackButton(const wchar* text, bool fadeIn)
@@ -276,7 +276,7 @@ void FrontendOptionAddBackButton(const wchar* text, bool fadeIn)
 	TextCopy(option.leftText, text);
 	option.screenOptionOrder = screenOptionOrder;
 	option.returnPrevPageFunc = nil;
-	option.save = false;
+	option.save = nil;
 }
 
 uint8 FrontendScreenAdd(const char* gxtKey, eMenuSprites sprite, int prevPage, int columnWidth, int headerHeight, int lineHeight,
@@ -300,4 +300,4 @@ uint8 FrontendScreenAdd(const char* gxtKey, eMenuSprites sprite, int prevPage, i
 
 	return screenOrder;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/extras/frontendoption.h b/src/extras/frontendoption.h
index b2bfbf5e..dac6be62 100644
--- a/src/extras/frontendoption.h
+++ b/src/extras/frontendoption.h
@@ -10,7 +10,7 @@
 
 // About texts:
 //		All text parameters accept wchar(including hardcoded wchar* and TheText.Get)
-//		except FrontendScreenAdd(it's char[8] by the design of Frontend).
+//		except FrontendScreenAdd(it's char[8] GXT key by the design of Frontend).
 //		All texts reload if custom options reloaded too, which includes language changes and via live reload feature in debug menu!
 
 // Execute direction:
@@ -26,7 +26,7 @@
 //
 // Static/select:	You allocate the variable, pass it to function and game sets it from user input among the strings given to function,
 //					then you can handle ChangeFunc(only called on enter if onlyApplyOnEnter set, or set immediately)
-//					and ReturnPrevPageFunc optionally. You can store the option in gta3.set if you pass true to corresponding parameter.
+//					and ReturnPrevPageFunc optionally. You can store the option in an INI file if you pass the key(as a char array) to corresponding parameter.
 //
 // Dynamic:			Passing variable to function is only needed if you want to store it, otherwise you should do
 //					all the operations with ButtonPressFunc, this includes allocating the variable.
@@ -91,11 +91,11 @@ struct FrontendOption
 	int8 type;
 	int8 screenOptionOrder;
 	int32 screen;
-	wchar leftText[64];
+	wchar leftText[128];
 	ReturnPrevPageFunc returnPrevPageFunc;
 	int8* value;
 	int8 displayedValue; // only if onlyApplyOnEnter enabled for now
-	bool save;
+	const char* save;
 	int32 ogOptionId; // for replacements, see overwrite parameter of SetCursor
 	
 	union {
@@ -151,12 +151,12 @@ uint8 GetNumberOfMenuOptions(int screen);
 
 void FrontendOptionSetCursor(int screen, int8 option, bool overwrite = false);
 
-// var is optional in AddDynamic, you can enable save parameter if you pass one, otherwise pass nil/0
+// var is optional in AddDynamic, enables you to save them in an INI file(also needs passing char array to saveName param. obv), otherwise pass nil/0
 void FrontendOptionAddBuiltinAction(const wchar* leftText, int action, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc);
-void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, int8 numRightTexts, int8 *var, bool onlyApplyOnEnter, ChangeFunc changeFunc, ReturnPrevPageFunc returnPrevPageFunc, bool save = false);
-void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc rightTextDrawFunc, int8 *var, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc, bool save = false);
+void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, int8 numRightTexts, int8 *var, bool onlyApplyOnEnter, ChangeFunc changeFunc, ReturnPrevPageFunc returnPrevPageFunc, const char* saveName = nil);
+void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc rightTextDrawFunc, int8 *var, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc, const char* saveName = nil);
 void FrontendOptionAddRedirect(const wchar* text, int to, int8 selectedOption = 0, bool fadeIn = true);
 void FrontendOptionAddBackButton(const wchar* text, bool fadeIn = true);
 
 uint8 FrontendScreenAdd(const char* gxtKey, eMenuSprites sprite, int prevPage, int columnWidth, int headerHeight, int lineHeight, int8 font, float fontScaleX, float fontScaleY, int8 alignment, bool showLeftRightHelper, ReturnPrevPageFunc returnPrevPageFunc = nil);
-#endif
\ No newline at end of file
+#endif
diff --git a/src/extras/ini_parser.hpp b/src/extras/ini_parser.hpp
new file mode 100644
index 00000000..99acf1ee
--- /dev/null
+++ b/src/extras/ini_parser.hpp
@@ -0,0 +1,314 @@
+/* 
+ *  Copyright (c) 2013-2015 Denilson das Mercês Amorim <dma_2012@hotmail.com>
+ *  
+ *  This software is provided 'as-is', without any express or implied
+ *  warranty. In no event will the authors be held liable for any damages
+ *  arising from the use of this software.
+ * 
+ *  Permission is granted to anyone to use this software for any purpose,
+ *  including commercial applications, and to alter it and redistribute it
+ *  freely, subject to the following restrictions:
+ * 
+ *     1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ * 
+ *     2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ * 
+ *     3. This notice may not be removed or altered from any source
+ *     distribution.
+ * 
+ */
+#ifndef LINB_INI_PARSER_HPP
+#define LINB_INI_PARSER_HPP
+
+/*
+ *  STL-like INI Container
+ */
+
+#include <string>       // for std::string
+#include <map>          // for std::map
+#include <cstdio>       // for std::FILE
+#include <algorithm>    // for std::find_if
+#include <functional>   // for std::function
+
+namespace linb
+{
+    template<
+        class CharT             = char,     /* Not compatible with other type here, since we're using C streams */
+        class StringType        = std::basic_string<CharT>,
+        class KeyContainer      = std::map<StringType, StringType>,
+        class SectionContainer  = std::map<StringType, KeyContainer>
+    > class basic_ini
+    {
+        public:
+            typedef CharT               char_type;
+            typedef StringType          string_type;
+            typedef KeyContainer        key_container;
+            typedef SectionContainer    section_container;
+            
+            // Typedef container values types
+            typedef typename section_container::value_type              value_type;
+            typedef typename section_container::key_type                key_type;
+            typedef typename section_container::mapped_type             mapped_type;
+            
+            // Typedef common types
+            typedef typename section_container::size_type               size_type;
+            typedef typename section_container::difference_type         difference_type;
+            
+            // Typedef iterators
+            typedef typename section_container::iterator                iterator;
+            typedef typename section_container::const_iterator          const_iterator;
+            typedef typename section_container::reverse_iterator        reverse_iterator;
+            typedef typename section_container::const_reverse_iterator  const_reverse_iterator;
+            
+            // typedef References and pointers
+            typedef typename section_container::reference               reference;
+            typedef typename section_container::const_reference         const_reference;
+            typedef typename section_container::pointer                 pointer;
+            typedef typename section_container::const_pointer           const_pointer;
+            
+        private:
+            section_container data;
+            
+        public:
+            
+            basic_ini()
+            { }
+
+            basic_ini(const char_type* filename)
+            { this->read_file(filename); }
+            
+            /* Iterator methods */
+            iterator begin()
+            { return data.begin(); }
+            const_iterator begin() const
+            { return data.begin(); }
+            iterator end()
+            { return data.end(); }
+            const_iterator end() const
+            { return data.end(); }
+            const_iterator cbegin() const
+            { return data.cbegin(); }
+            const_iterator cend() const
+            { return data.cend(); }
+            
+            /* Reverse iterator methods */
+            reverse_iterator rbegin()
+            { return data.rbegin(); }
+            const_reverse_iterator rbegin() const
+            { return data.rbegin(); }
+            reverse_iterator rend()
+            { return data.rend(); }
+            const_reverse_iterator rend() const
+            { return data.rend(); }
+            const_reverse_iterator crbegin() const
+            { return data.crbegin(); }
+            const_reverse_iterator crend() const
+            { return data.crend(); }
+            
+            /* Acessing index methods */
+            mapped_type& operator[](const string_type& sect)
+            { return data[sect]; }
+            mapped_type& operator[](string_type&& sect)
+            { return data[std::forward<string_type>(sect)]; }
+            mapped_type& at( const string_type& sect)
+            { return data.at(sect); }
+            const mapped_type& at(const string_type& sect) const
+            { return data.at(sect); }
+            
+            /* Capacity information */
+            bool empty() const
+            { return data.empty(); }
+            size_type size() const
+            { return data.size(); }
+            size_type max_size() const
+            { return data.max_size(); }
+            
+            /* Modifiers */
+            void clear()
+            { return data.clear(); }
+            
+            /* Lookup */
+            size_type count(const string_type& sect)
+            { return data.count(sect); }
+            iterator find(const string_type& sect)
+            { return data.find(sect); }
+
+            /* Gets a value from the specified section & key, default_value is returned if the sect & key doesn't exist */
+            string_type get(const string_type& sect, const key_type& key, const string_type& default_value)
+            {
+                auto it = this->find(sect);
+                if(it != this->end())
+                {
+                    auto itv = it->second.find(key);
+                    if(itv != it->second.end())
+                        return itv->second;
+                }
+                return default_value;
+            }
+
+            /* Sets the value of a value in the ini */
+            void set(const string_type& sect, const key_type& key, const string_type& value)
+            {
+                (*this)[sect][key] = value; // no emplace since overwrite!
+            }
+
+            /* Too lazy to continue this container... If you need more methods, just add it */
+            
+
+#if 1
+            bool read_file(const char_type* filename)
+            {
+                /* Using C stream in a STL-like container, funny?
+                 */
+                if(FILE* f = fopen(filename, "r"))
+                {
+                    key_container* keys = nullptr;
+                    char_type buf[2048];
+                    string_type line;
+                    string_type key;
+                    string_type value;
+                    string_type null_string;
+                    size_type pos;
+                    
+                    // Trims an string
+                    auto trim = [](string_type& s, bool trimLeft, bool trimRight) -> string_type&
+                    {
+                        if(s.size())
+                        {
+                            // Ignore UTF-8 BOM
+                            while(s.size() >= 3 && s[0] == (char)(0xEF) && s[1] == (char)(0xBB) && s[2] == (char)(0xBF))
+                                s.erase(s.begin(), s.begin() + 3);
+
+                            if(trimLeft)
+                                s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::function<int(int)>(::isspace))));
+                            if(trimRight)
+                                s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::function<int(int)>(::isspace))).base(), s.end());
+                        }
+                        return s;
+                    };
+                    
+                    // Start parsing
+                    while(fgets(buf, sizeof(buf), f))
+                    {
+                        // What a thing, reading into a char buffer and then putting in the string...
+                        line = buf;
+                        
+                        // Find comment and remove anything after it from the line
+                        if((pos = line.find_first_of(';')) != line.npos)
+                            line.erase(pos);
+                        
+                        // Trim the string, and if it gets empty, skip this line
+                        if(trim(line, true, true).empty())
+                            continue;
+                        
+                        // Find section name
+                        if(line.front() == '[' && line.back() == ']')
+                        {
+                            pos = line.length() - 1; //line.find_first_of(']');
+                            if(pos != line.npos)
+                            {
+                                trim(key.assign(line, 1, pos-1), true, true);
+                                keys = &data[std::move(key)];  // Create section
+                            }
+                            else
+                                keys = nullptr;
+                        }
+                        else
+                        {
+                            // Find key and value positions
+                            pos = line.find_first_of('=');
+                            if(pos == line.npos)
+                            {
+                                // There's only the key
+                                key = line;         // No need for trim, line is already trimmed
+                                value.clear();
+                            }
+                            else
+                            {
+                                // There's the key and the value
+                                trim(key.assign(line, 0, pos), false, true);                  // trim the right
+                                trim(value.assign(line, pos + 1, line.npos), true, false);    // trim the left
+                            }
+
+                            // Put the key/value into the current keys object, or into the section "" if no section has been found
+                            #if __cplusplus >= 201103L || _MSC_VER >= 1800
+                            (keys ? *keys : data[null_string]).emplace(std::move(key), std::move(value));
+                            #else
+                            (keys ? *keys : data[null_string])[key] = value;
+                            key.clear(); value.clear();
+                            #endif
+                        }
+                    }
+                    
+                    fclose(f);
+                    return true;
+                }
+                return false;
+            }
+
+            /*
+             *  Dumps the content of this container into an ini file
+             */
+            bool write_file(const char_type* filename)
+            {
+                if(FILE* f = fopen(filename, "w"))
+                {
+                    bool first = true;
+                    for(auto& sec : this->data)
+                    {
+                        fprintf(f, first? "[%s]\n" : "\n[%s]\n", sec.first.c_str());
+                        first = false;
+                        for(auto& kv : sec.second)
+                        {
+                            if(kv.second.empty())
+                                fprintf(f, "%s\n", kv.first.c_str());
+                            else
+                                fprintf(f, "%s = %s\n", kv.first.c_str(), kv.second.c_str());
+                        }
+                    }
+                    fclose(f);
+                    return true;
+                }
+                return false;
+            }
+
+
+            /*
+            */
+            bool load_file(const char_type* filename)
+            {
+                return read_file(filename);
+            }
+
+            bool load_file(const StringType& filename)
+            {
+                return load_file(filename.c_str());
+            }
+
+            bool write_file(const StringType& filename)
+            {
+                return write_file(filename.c_str());
+            }
+#endif       
+            
+
+        
+    };
+    
+    
+    /* Use default basic_ini
+     * 
+     *  Limitations:
+     *      * Not unicode aware
+     *      * Case sensitive
+     *      * Sections must have unique keys
+     */
+    typedef basic_ini<>     ini;
+}
+    
+#endif
+