mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
cc3ad487a7
This change brings the order of monitors close to the order of "Display Properties" due to using EnumDisplayDevices and EnumDisplaySettings instead of EnumDisplayMonitors. (If EnumDisplayDevices failed, EnumDisplayMonitors is used as before.) ----- * Added the "Display Monitor" submenu in [Skins Menu]-[Position]. These menus convert the present position to the relative position from the specified monitor. (But the meter window doesn't move to the specified monitor area immediately. Only converts.) - "Use default: Primary monitor" removes the @-directive from WindowX/Y. - @0(@1, @2, ...) adds the specified monitor number to WindowX/Y. @0 means "The Virtual Screen". (http://msdn.microsoft.com/en-us/library/dd145136%28VS.85%29.aspx) - If "Auto-select based on window position" is checked, the WindowX and WindowY "@n" settings are made automatically based on the position of the meter's window. If a monitor is selected directly using "Display Monitor" in the Rainmeter / skin context menu, this menu is unchecked. This setting can be manually made in either the [Rainmeter] (all configs) or individual config sections of Rainmeter.ini. AutoSelectScreen If set to 1, the WindowX and WindowY "@n" settings are made automatically based on the position of the meter's window. If a monitor is selected directly using "Display Monitor" in the Rainmeter / skin context menu, this setting is reset to 0. ----- * Added the variables for multiple display monitors and the virtual screen. All X/Y positions are represented in the virtual screen coordinates. The following variables are for the virtual screen. #VSCREENAREAX# is the X-position of the left-side of the virtual screen. #VSCREENAREAY# is the Y-position of the top-side of the virtual screen. #VSCREENAREAWIDTH# is the width of the virtual screen. #VSCREENAREAHEIGHT# is the height of the virtual screen. The following variables are for the PRESENT monitor. Note that these variables automatically change by the WindowX and WindowY "@n" settings. If "@n" is not set, these variables return the value of the primary monitor. #WORKAREAX# is the X-position of the left-side of the work area. #WORKAREAY# is the Y-position of the top-side of the work area. #WORKAREAWIDTH# is the width of the work area. #WORKAREAHEIGHT# is the height of the work area. #SCREENAREAX# is the X-position of the left-side of the monitor screen. #SCREENAREAY# is the Y-position of the top-side of the monitor screen. #SCREENAREAWIDTH# is the width of the display resolution. #SCREENAREAHEIGHT# is the height of the display resolution. The following variables are for the PRIMARY monitor. #PWORKAREAX# is the X-position of the left-side of the work area. #PWORKAREAY# is the Y-position of the top-side of the work area. #PWORKAREAWIDTH# is the width of the work area. #PWORKAREAHEIGHT# is the height of the work area. #PSCREENAREAX# is the X-position of the left-side of the monitor screen. (maybe, always 0) #PSCREENAREAY# is the Y-position of the top-side of the monitor screen. (maybe, always 0) #PSCREENAREAWIDTH# is the width of the display resolution. #PSCREENAREAHEIGHT# is the height of the display resolution. The following variables are for the SPECIFIED monitor. (@n = @1, @2, ...) #WORKAREAX@n# is the X-position of the left-side of the work area. #WORKAREAY@n# is the Y-position of the top-side of the work area. #WORKAREAWIDTH@n# is the width of the work area. #WORKAREAHEIGHT@n# is the height of the work area. #SCREENAREAX@n# is the X-position of the left-side of the monitor screen. #SCREENAREAY@n# is the Y-position of the top-side of the monitor screen. #SCREENAREAWIDTH@n# is the width of the display resolution. #SCREENAREAHEIGHT@n# is the height of the display resolution. ----- * Other related changes: - Fixed the problem that the primary monitor isn't recognized correctly. - Fixed the problem that the information of the multiple display monitors is refreshed excessively. - For DynamicVariables, when display setting or workarea size has been changed, all variables are now updated to apply changed WORKAREA/SCREENAREA variables. - Fixed the problem that the "On Desktop" window isn't dragged correctly when the top-left corner of the virtual screen has negative coordinates. - Changed the way to stick the "On Desktop" window. ("SysListView32/FolderView" is used instead of "Progman/Program Manager".) ----- * Other changes: - When the meter window is draggable and isn't dragged, LeftMouseUpAction is now executed. - Added MouseDoubleClickAction (LeftMouseDoubleClickAction, RightMouseDoubleClickAction, MiddleMouseDoubleClickAction). If MouseDoubleClickAction is empty when mouse button is double-clicked, MouseDownAction is executed instead. - Fixed the problem that the Meter's hit-test code checks outside the area. - Changed the way to set the #CURRENTCONFIG#. (CMeterWindow::GetSkinName() is now used instead of parsing the path.)
94 lines
3.5 KiB
C++
94 lines
3.5 KiB
C++
/*
|
|
Copyright (C) 2004 Kimmo Pekkola
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __CONFIGPARSER_H__
|
|
#define __CONFIGPARSER_H__
|
|
|
|
#include <windows.h>
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <hash_map>
|
|
#include <gdiplus.h>
|
|
#include "ccalc-0.5.1/mparser.h"
|
|
|
|
class CRainmeter;
|
|
class CMeterWindow;
|
|
class CMeasure;
|
|
|
|
class CConfigParser
|
|
{
|
|
public:
|
|
CConfigParser();
|
|
~CConfigParser();
|
|
|
|
void Initialize(LPCTSTR filename, CRainmeter* pRainmeter, CMeterWindow* meterWindow = NULL);
|
|
void AddMeasure(CMeasure* pMeasure);
|
|
void SetVariable(const std::wstring& strVariable, const std::wstring& strValue);
|
|
void SetStyleTemplate(const std::wstring& strStyle) { m_StyleTemplate = strStyle; }
|
|
|
|
void ResetVariables(CRainmeter* pRainmeter, CMeterWindow* meterWindow = NULL);
|
|
|
|
const std::wstring& ReadString(LPCTSTR section, LPCTSTR key, LPCTSTR defValue, bool bReplaceMeasures = true);
|
|
double ReadFloat(LPCTSTR section, LPCTSTR key, double defValue);
|
|
double ReadFormula(LPCTSTR section, LPCTSTR key, double defValue);
|
|
int ReadInt(LPCTSTR section, LPCTSTR key, int defValue);
|
|
Gdiplus::Color ReadColor(LPCTSTR section, LPCTSTR key, Gdiplus::Color defValue);
|
|
std::vector<Gdiplus::REAL> ReadFloats(LPCTSTR section, LPCTSTR key);
|
|
|
|
std::wstring& GetFilename() { return m_Filename; }
|
|
const std::vector<std::wstring>& GetSections();
|
|
|
|
static std::vector<std::wstring> Tokenize(const std::wstring& str, const std::wstring delimiters);
|
|
|
|
static void ClearMultiMonitorVariables() { c_MonitorVariables.clear(); }
|
|
static void UpdateWorkareaVariables() { SetMultiMonitorVariables(false); }
|
|
|
|
private:
|
|
void SetDefaultVariables(CRainmeter* pRainmeter, CMeterWindow* meterWindow);
|
|
void ReadVariables();
|
|
void ReplaceVariables(std::wstring& result);
|
|
Gdiplus::Color ParseColor(LPCTSTR string);
|
|
|
|
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> GetKeys(const std::wstring& strSection);
|
|
|
|
void SetAutoSelectedMonitorVariables(CMeterWindow* meterWindow);
|
|
|
|
static void SetMultiMonitorVariables(bool reset);
|
|
static void SetMonitorVariable(const std::wstring& strVariable, const std::wstring& strValue);
|
|
|
|
std::map<std::wstring, std::wstring> m_Variables;
|
|
std::wstring m_Filename;
|
|
|
|
hqMathParser* m_Parser;
|
|
std::map<std::wstring, CMeasure*> m_Measures;
|
|
|
|
std::wstring m_StyleTemplate;
|
|
|
|
std::vector<std::wstring> m_Sections; // The sections must be an ordered array
|
|
stdext::hash_map<std::wstring, std::vector<std::wstring> > m_Keys;
|
|
stdext::hash_map<std::wstring, std::wstring> m_Values;
|
|
|
|
static std::map<std::wstring, std::wstring> c_MonitorVariables;
|
|
};
|
|
|
|
#endif
|