The skin files can read other files with @include statement.

Library/ConfigParser.cpp

@@ -61,10 +61,10 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
 
 	m_Variables.clear();
 	m_Measures.clear();
+	m_Keys.clear();
+	m_Values.clear();
 
-	ReadIniFile(m_Filename);
+	// Set the default variables. Do this before the ini file is read so that the paths can be used with @include
-
-	// Set the default variables
 	if (pRainmeter)
 	{
 		SetVariable(L"PROGRAMPATH", pRainmeter->GetPath());
@@ -92,6 +92,7 @@ void CConfigParser::Initialize(LPCTSTR filename, CRainmeter* pRainmeter)
 		SetVariable(L"SCREENAREAHEIGHT", buffer);
 	}
 
+	ReadIniFile(m_Filename);
 	ReadVariables();
 }
 
@@ -110,22 +111,72 @@ void CConfigParser::ReadVariables()
 	}
 }
 
-//==============================================================================
 /**
 ** Sets a new value for the variable. The DynamicVariables must be set to 1 in the
 ** meter/measure for the changes to be applied.
 ** 
 ** \param strVariable
 ** \param strValue
-** \return void
 */
 void CConfigParser::SetVariable(const std::wstring& strVariable, const std::wstring& strValue)
 {
+	// DebugLog(L"Variable: %s=%s (size=%i)", strVariable.c_str(), strValue.c_str(), m_Variables.size());
+
 	std::wstring strTmp(strVariable);
 	std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
 	m_Variables[strTmp] = strValue;
 }
 
+/**
+** Replaces environment and internal variables in the given string.
+** 
+** \param result The string where the variables are returned. The string is modified.
+*/
+void CConfigParser::ReplaceVariables(std::wstring& result)
+{
+	CRainmeter::ExpandEnvironmentVariables(result);
+
+	// Check for variables (#VAR#)
+	size_t start = 0;
+	size_t end = std::wstring::npos;
+	size_t pos = std::wstring::npos;
+	bool loop = true;
+
+	do 
+	{
+		pos = result.find(L'#', start);
+		if (pos != std::wstring::npos)
+		{
+			end = result.find(L'#', pos + 1);
+			if (end != std::wstring::npos)
+			{
+				std::wstring strTmp(result.begin() + pos + 1, result.begin() + end);
+				std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
+				
+				std::map<std::wstring, std::wstring>::iterator iter = m_Variables.find(strTmp);
+				if (iter != m_Variables.end())
+				{
+					// Variable found, replace it with the value
+					result.replace(result.begin() + pos, result.begin() + end + 1, (*iter).second);
+					start = pos + (*iter).second.length();
+				}
+				else
+				{
+					start = end;
+				}
+			}
+			else
+			{
+				loop = false;
+			}
+		}
+		else
+		{
+			loop = false;
+		}
+	} while(loop);
+}
+
 /*
 ** ReadString
 **
@@ -175,56 +226,16 @@ const std::wstring& CConfigParser::ReadString(LPCTSTR section, LPCTSTR key, LPCT
 		}
 	}
 
-	CRainmeter::ExpandEnvironmentVariables(result);
+	ReplaceVariables(result);
-
-	// Check for variables (#VAR#)
-	size_t start = 0;
-	size_t end = std::wstring::npos;
-	size_t pos = std::wstring::npos;
-	bool loop = true;
-
-	do 
-	{
-		pos = result.find(L'#', start);
-		if (pos != std::wstring::npos)
-		{
-			end = result.find(L'#', pos + 1);
-			if (end != std::wstring::npos)
-			{
-				std::wstring strTmp(result.begin() + pos + 1, result.begin() + end);
-				std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
-				
-				std::map<std::wstring, std::wstring>::iterator iter = m_Variables.find(strTmp);
-				if (iter != m_Variables.end())
-				{
-					// Variable found, replace it with the value
-					result.replace(result.begin() + pos, result.begin() + end + 1, (*iter).second);
-					start = pos + (*iter).second.length();
-				}
-				else
-				{
-					start = end;
-				}
-			}
-			else
-			{
-				loop = false;
-			}
-		}
-		else
-		{
-			loop = false;
-		}
-	} while(loop);
 
 	// Check for measures ([Measure])
 	if (!m_Measures.empty() && bReplaceMeasures)
 	{
-		start = 0;
+		size_t start = 0;
-		end = std::wstring::npos;
+		size_t end = std::wstring::npos;
-		pos = std::wstring::npos;
+		size_t pos = std::wstring::npos;
 		size_t pos2 = std::wstring::npos;
-		loop = true;
+		bool loop = true;
 		do 
 		{
 			pos = result.find(L'[', start);
@@ -459,10 +470,15 @@ Color CConfigParser::ParseColor(LPCTSTR string)
 ** 
 ** \param iniFile The ini file to be read.
 */
-void CConfigParser::ReadIniFile(const std::wstring& iniFile)
+void CConfigParser::ReadIniFile(const std::wstring& iniFile, int depth)
 {
-	m_Keys.clear();
+	// DebugLog(L"Reading file: %s", iniFile.c_str());
-	m_Values.clear();
+
+	if (depth > 100)	// Is 100 enough to assume the include loop never ends?
+	{
+		MessageBox(NULL, L"It looks like you've made an infinite\nloop with the @include statements.\nPlease check your skin.", L"Rainmeter", MB_OK | MB_ICONERROR);
+		return;
+	}
 
 	// Get all the sections (i.e. different meters)
 	WCHAR* items = new WCHAR[MAX_LINE_LENGTH];
@@ -487,8 +503,10 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
 	{
 		std::wstring strTmp(pos);
 		std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::tolower);
-		m_Keys[strTmp] = std::vector<std::wstring>();
+		if (m_Keys.find(strTmp) == m_Keys.end())
-
+		{
+			m_Keys[strTmp] = std::vector<std::wstring>();
+		}
 		pos = pos + wcslen(pos) + 1;
 	}
 
@@ -526,7 +544,21 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
 				buffer = new WCHAR[bufferSize];
 			};
 
-			SetValue((*iter).first, strKey, buffer);
+			if (wcsnicmp(strKey.c_str(), L"@include", 8) == 0)
+			{
+				std::wstring strIncludeFile = buffer;
+				ReplaceVariables(strIncludeFile);
+				if (strIncludeFile.find(L':') == std::wstring::npos)
+				{
+					// It's a relative path so add the current path as a prefix
+					strIncludeFile = CRainmeter::ExtractPath(iniFile) + strIncludeFile;
+				}
+				ReadIniFile(strIncludeFile, depth + 1);
+			}
+			else
+			{
+				SetValue((*iter).first, strKey, buffer);
+			}
 
 			pos = pos + wcslen(pos) + 1;
 		}
@@ -545,6 +577,8 @@ void CConfigParser::ReadIniFile(const std::wstring& iniFile)
 */
 void CConfigParser::SetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strValue)
 {
+	// DebugLog(L"[%s] %s=%s (size: %i)", strSection.c_str(), strKey.c_str(), strValue.c_str(), m_Values.size());
+
 	std::wstring strTmpSection(strSection);
 	std::wstring strTmpKey(strKey);
 	std::transform(strTmpSection.begin(), strTmpSection.end(), strTmpSection.begin(), ::tolower);

Library/ConfigParser.h

@@ -49,16 +49,17 @@ public:
 	std::vector<Gdiplus::REAL> ReadFloats(LPCTSTR section, LPCTSTR key);
 
 	std::wstring& GetFilename() { return m_Filename; }
+	std::vector<std::wstring> GetSections();
 
 private:
 	void ReadVariables();
+	void ReplaceVariables(std::wstring& result);
 	Gdiplus::Color ParseColor(LPCTSTR string);
 	std::vector<std::wstring> Tokenize(const std::wstring& str, const std::wstring delimiters);
 
-	void ReadIniFile(const std::wstring& strFileName);
+	void ReadIniFile(const std::wstring& strFileName, int depth = 0);
 	void SetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strValue);
 	const std::wstring& GetValue(const std::wstring& strSection, const std::wstring& strKey, const std::wstring& strDefault);
-	std::vector<std::wstring> GetSections();
 	std::vector<std::wstring> GetKeys(const std::wstring& strSection);
 
 	std::map<std::wstring, std::wstring> m_Variables;

Library/MeterWindow.cpp

@@ -1506,42 +1506,30 @@ void CMeterWindow::ReadSkin()
 
 	// Create the meters and measures
 
-	// Get all the sections (i.e. different meters)
+	// Get all the sections (i.e. different meters, measures and the other stuff)
-	WCHAR* items = new WCHAR[MAX_LINE_LENGTH];
+	std::vector<std::wstring> arraySections = m_Parser.GetSections();
-	int size = MAX_LINE_LENGTH;
 
-	// Get all the sections
+	for (size_t i = 0; i < arraySections.size(); i++)
-	while(true)
 	{
-		int res = GetPrivateProfileString( NULL, NULL, NULL, items, size, iniFile.c_str());
+		std::wstring strSection = arraySections[i];
-		if (res == 0) { delete [] items; return; }	// File not found
-		if (res < size - 2) break;		// Fits in the buffer
 
-		delete [] items;
+		if(wcsicmp(L"Rainmeter", strSection.c_str()) != 0 && 
-		size *= 2;
+			wcsicmp(L"Variables", strSection.c_str()) != 0 &&
-		items = new WCHAR[size];
+			wcsicmp(L"Metadata", strSection.c_str()) != 0)
-	};
-
-	WCHAR* pos = items;
-	while(wcslen(pos) > 0)
-	{
-		if(wcsicmp(L"Rainmeter", pos) != 0 && 
-			wcsicmp(L"Variables", pos) != 0 &&
-			wcsicmp(L"Metadata", pos) != 0)
 		{
 			std::wstring meterName, measureName;
 
 			// Check if the item is a meter or a measure (or perhaps something else)
-			measureName = m_Parser.ReadString(pos, L"Measure", L"");
+			measureName = m_Parser.ReadString(strSection.c_str(), L"Measure", L"");
-			meterName = m_Parser.ReadString(pos, L"Meter", L"");
+			meterName = m_Parser.ReadString(strSection.c_str(), L"Meter", L"");
 			if (measureName.length() > 0)
 			{
 				try
 				{
 					// It's a measure
 					CMeasure* measure = CMeasure::Create(measureName.c_str(), this);
-					measure->SetName(pos);
+					measure->SetName(strSection.c_str());
-					measure->ReadConfig(m_Parser, pos);
+					measure->ReadConfig(m_Parser, strSection.c_str());
 					m_Measures.push_back(measure);
 
 					m_Parser.AddMeasure(measure);
@@ -1557,8 +1545,8 @@ void CMeterWindow::ReadSkin()
 				{
 					// It's a meter
 					CMeter* meter = CMeter::Create(meterName.c_str(), this);
-					meter->SetName(pos);
+					meter->SetName(strSection.c_str());
-					meter->ReadConfig(pos);
+					meter->ReadConfig(strSection.c_str());
 					m_Meters.push_back(meter);
 				}
 				catch (CError& error)
@@ -1568,11 +1556,8 @@ void CMeterWindow::ReadSkin()
 			}
 			// If it's not a meter or measure it will be ignored
 		}
-		pos = pos + wcslen(pos) + 1;
 	}
 
-	delete [] items;
-
 	if (m_Meters.empty())
 	{
 		MessageBox(m_Window, L"Your configuration file doesn't contain any meters!\nYour skin's ini-file might be out of date.", APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);

Library/TrayWindow.cpp

@@ -493,7 +493,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				int pos = (wParam & 0x0ffff) - ID_THEME_FIRST;
 
 				const std::vector<std::wstring>& themes = Rainmeter->GetAllThemes();
-				if (pos >= 0 && pos < themes.size())
+				if (pos >= 0 && pos < (int)themes.size())
 				{
 					std::wstring command = L"\"" + Rainmeter->GetPath();
 					command += L"\\Addons\\RainThemes\\RainThemes.exe\" /load \"";

revision-number.h

@@ -1,2 +1,2 @@
 #pragma once
-const int revision_number = 192;
+const int revision_number = 213;