mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Got rid of some redundant codes from r471.
This commit is contained in:
parent
935852426a
commit
6b6635b9c9
@ -261,6 +261,44 @@ void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
** BangGroupWithArgs
|
||||||
|
**
|
||||||
|
** Parses Bang args for Group
|
||||||
|
**
|
||||||
|
*/
|
||||||
|
void BangGroupWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs)
|
||||||
|
{
|
||||||
|
if (Rainmeter)
|
||||||
|
{
|
||||||
|
std::vector<std::wstring> subStrings = ParseString(arg);
|
||||||
|
|
||||||
|
if (subStrings.size() > numOfArgs)
|
||||||
|
{
|
||||||
|
std::multimap<int, CMeterWindow*> windows;
|
||||||
|
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[numOfArgs]);
|
||||||
|
|
||||||
|
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
||||||
|
for (; iter != windows.end(); ++iter)
|
||||||
|
{
|
||||||
|
std::wstring argument = L"\"";
|
||||||
|
for (size_t i = 0; i < numOfArgs; ++i)
|
||||||
|
{
|
||||||
|
argument += subStrings[i];
|
||||||
|
argument += L"\" \"";
|
||||||
|
}
|
||||||
|
argument += (*iter).second->GetSkinName();
|
||||||
|
argument += L"\"";
|
||||||
|
BangWithArgs(bang, argument.c_str(), numOfArgs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DebugLog(L"Incorrect number of arguments for the group bang!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** RainmeterHide
|
** RainmeterHide
|
||||||
@ -591,29 +629,7 @@ void RainmeterSetVariable(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterHideGroup(HWND, const char* arg)
|
void RainmeterHideGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_HIDE, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_HIDE, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterHideGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -624,29 +640,7 @@ void RainmeterHideGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterShowGroup(HWND, const char* arg)
|
void RainmeterShowGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_SHOW, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_SHOW, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterShowGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -657,29 +651,7 @@ void RainmeterShowGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterToggleGroup(HWND, const char* arg)
|
void RainmeterToggleGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_TOGGLE, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_TOGGLE, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterToggleGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -690,29 +662,7 @@ void RainmeterToggleGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterHideFadeGroup(HWND, const char* arg)
|
void RainmeterHideFadeGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_HIDEFADE, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_HIDEFADE, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterHideFadeGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -723,29 +673,7 @@ void RainmeterHideFadeGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterShowFadeGroup(HWND, const char* arg)
|
void RainmeterShowFadeGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_SHOWFADE, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_SHOWFADE, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterShowFadeGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -756,29 +684,7 @@ void RainmeterShowFadeGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterToggleFadeGroup(HWND, const char* arg)
|
void RainmeterToggleFadeGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_TOGGLEFADE, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_TOGGLEFADE, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterToggleFadeGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -855,29 +761,7 @@ void RainmeterToggleMeasureGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterRefreshGroup(HWND, const char* arg)
|
void RainmeterRefreshGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_REFRESH, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_REFRESH, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterRefreshGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -888,29 +772,7 @@ void RainmeterRefreshGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterRedrawGroup(HWND, const char* arg)
|
void RainmeterRedrawGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_REDRAW, ConvertToWide(arg).c_str(), 0);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 0)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[0]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_REDRAW, argument.c_str(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterRedrawGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -951,31 +813,7 @@ void RainmeterDeactivateConfigGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterZPosGroup(HWND, const char* arg)
|
void RainmeterZPosGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_ZPOS, ConvertToWide(arg).c_str(), 1);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 1)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[1]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += subStrings[0];
|
|
||||||
argument += L"\" \"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_ZPOS, argument.c_str(), 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterZPosGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -986,31 +824,7 @@ void RainmeterZPosGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterSetTransparencyGroup(HWND, const char* arg)
|
void RainmeterSetTransparencyGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_SETTRANSPARENCY, ConvertToWide(arg).c_str(), 1);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 1)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[1]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += subStrings[0];
|
|
||||||
argument += L"\" \"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_SETTRANSPARENCY, argument.c_str(), 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterSetTransparencyGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1021,33 +835,7 @@ void RainmeterSetTransparencyGroup(HWND, const char* arg)
|
|||||||
*/
|
*/
|
||||||
void RainmeterSetVariableGroup(HWND, const char* arg)
|
void RainmeterSetVariableGroup(HWND, const char* arg)
|
||||||
{
|
{
|
||||||
if (Rainmeter)
|
BangGroupWithArgs(BANG_SETVARIABLE, ConvertToWide(arg).c_str(), 2);
|
||||||
{
|
|
||||||
std::vector<std::wstring> subStrings = ParseString(ConvertToWide(arg).c_str());
|
|
||||||
|
|
||||||
if (subStrings.size() > 2)
|
|
||||||
{
|
|
||||||
std::multimap<int, CMeterWindow*> windows;
|
|
||||||
Rainmeter->GetMeterWindowsByLoadOrder(windows, subStrings[2]);
|
|
||||||
|
|
||||||
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();
|
|
||||||
for (; iter != windows.end(); ++iter)
|
|
||||||
{
|
|
||||||
std::wstring argument = L"\"";
|
|
||||||
argument += subStrings[0];
|
|
||||||
argument += L"\" \"";
|
|
||||||
argument += subStrings[1];
|
|
||||||
argument += L"\" \"";
|
|
||||||
argument += (*iter).second->GetSkinName();
|
|
||||||
argument += L"\"";
|
|
||||||
BangWithArgs(BANG_SETVARIABLE, argument.c_str(), 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DebugLog(L"Unable to parse the arguments for !RainmeterSetVariableGroup");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -100,6 +100,7 @@ void RainmeterPluginBang(HWND, const char* arg);
|
|||||||
void RainmeterQuit(HWND, const char* arg);
|
void RainmeterQuit(HWND, const char* arg);
|
||||||
|
|
||||||
void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs);
|
void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs);
|
||||||
|
void BangGroupWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs);
|
||||||
|
|
||||||
struct GlobalConfig
|
struct GlobalConfig
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user