diff --git a/far/PluginA.cpp b/far/PluginA.cpp index 6ad7f835e1..9dfc6cef89 100644 --- a/far/PluginA.cpp +++ b/far/PluginA.cpp @@ -5551,7 +5551,7 @@ void* PluginA::Open(OpenInfo* Info) break; case OPEN_FROMMACRO: - OpenFromA = oldfar::OPEN_FROMMACRO|Global->CtrlObject->Macro.GetMode(); + OpenFromA = oldfar::OPEN_FROMMACRO|Global->CtrlObject->Macro.GetArea(); Buffer.reset(UnicodeToAnsi(reinterpret_cast(Info->Data)->Count ? reinterpret_cast(Info->Data)->Values[0].String : L"")); Ptr = reinterpret_cast(Buffer.get()); break; diff --git a/far/changelog b/far/changelog index d07dd15ede..11024d275f 100644 --- a/far/changelog +++ b/far/changelog @@ -1,4 +1,8 @@ -shmuel 21.01.2015 23:58:16 +0200 - build 4252 +shmuel 22.01.2015 13:21:30 +0200 - build 4253 + +1. Рефакторинг. + +shmuel 21.01.2015 23:58:16 +0200 - build 4252 1. Рефакторинг. diff --git a/far/dialog.cpp b/far/dialog.cpp index 6ff1215f9b..cf07c2e584 100644 --- a/far/dialog.cpp +++ b/far/dialog.cpp @@ -370,7 +370,7 @@ void Dialog::Init() DialogMode.Set(DMODE_OLDSTYLE); } - //_SVS(SysLog(L"Dialog =%d",Global->CtrlObject->Macro.GetMode())); + //_SVS(SysLog(L"Dialog =%d",Global->CtrlObject->Macro.GetArea())); // çàïîìèíàåì ïðåäûäóùèé çàãîëîâîê êîíñîëè OldTitle = std::make_unique(); IdExist=false; diff --git a/far/editcontrol.cpp b/far/editcontrol.cpp index 40746e4d14..0eab5ba757 100644 --- a/far/editcontrol.cpp +++ b/far/editcontrol.cpp @@ -343,7 +343,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,int& BackKey, FARMAC string CurrentLine; size_t EventsCount = 0; Console().GetNumberOfInputEvents(EventsCount); - if(ECFlags.Check(EC_ENABLEAUTOCOMPLETE) && *m_Str && !Reenter && !EventsCount && (Global->CtrlObject->Macro.GetCurRecord() == MACROSTATE_NOMACRO || Manual)) + if(ECFlags.Check(EC_ENABLEAUTOCOMPLETE) && *m_Str && !Reenter && !EventsCount && (Global->CtrlObject->Macro.GetState() == MACROSTATE_NOMACRO || Manual)) { Reenter++; diff --git a/far/fileedit.cpp b/far/fileedit.cpp index 7ff38bf0d4..cfdd6185b1 100644 --- a/far/fileedit.cpp +++ b/far/fileedit.cpp @@ -948,11 +948,11 @@ int FileEditor::ReProcessKey(int Key,int CalledFromControl) _SVS(if (Key=='n' || Key=='m')) _SVS(SysLog(L"%d Key='%c'",__LINE__,Key)); - if (!CalledFromControl && (Global->CtrlObject->Macro.IsRecording() == MACROSTATE_RECORDING_COMMON || Global->CtrlObject->Macro.IsExecuting() == MACROSTATE_EXECUTING_COMMON || Global->CtrlObject->Macro.GetCurRecord() == MACROSTATE_NOMACRO)) + if (!CalledFromControl && (Global->CtrlObject->Macro.IsRecording() == MACROSTATE_RECORDING_COMMON || Global->CtrlObject->Macro.IsExecuting() == MACROSTATE_EXECUTING_COMMON || Global->CtrlObject->Macro.GetState() == MACROSTATE_NOMACRO)) { _SVS(if (Global->CtrlObject->Macro.IsRecording() == MACROSTATE_RECORDING_COMMON || Global->CtrlObject->Macro.IsExecuting() == MACROSTATE_EXECUTING_COMMON)) - _SVS(SysLog(L"%d !!!! Global->CtrlObject->Macro.GetCurRecord() != MACROSTATE_NOMACRO !!!!",__LINE__)); + _SVS(SysLog(L"%d !!!! Global->CtrlObject->Macro.GetState() != MACROSTATE_NOMACRO !!!!",__LINE__)); ProcessedNext=!ProcessEditorInput(Global->WindowManager->GetLastInputRecord()); } diff --git a/far/filelist.cpp b/far/filelist.cpp index bebcfced33..9f21124934 100644 --- a/far/filelist.cpp +++ b/far/filelist.cpp @@ -709,7 +709,7 @@ int FileList::SendKeyToPlugin(DWORD Key,bool Pred) _ALGO(SysLog(L"Key=%s Pred=%d",_FARKEY_ToName(Key),Pred)); if (m_PanelMode==PLUGIN_PANEL && - (Global->CtrlObject->Macro.IsRecording() == MACROSTATE_RECORDING_COMMON || Global->CtrlObject->Macro.IsExecuting() == MACROSTATE_EXECUTING_COMMON || Global->CtrlObject->Macro.GetCurRecord() == MACROSTATE_NOMACRO) + (Global->CtrlObject->Macro.IsRecording() == MACROSTATE_RECORDING_COMMON || Global->CtrlObject->Macro.IsExecuting() == MACROSTATE_EXECUTING_COMMON || Global->CtrlObject->Macro.GetState() == MACROSTATE_NOMACRO) ) { _ALGO(SysLog(L"call Plugins.ProcessKey() {")); diff --git a/far/filepanels.cpp b/far/filepanels.cpp index 0027dc66c4..ebd0434bef 100644 --- a/far/filepanels.cpp +++ b/far/filepanels.cpp @@ -1216,7 +1216,7 @@ void FilePanels::GoToFile(const string& FileName) } -FARMACROAREA FilePanels::GetMacroMode() const +FARMACROAREA FilePanels::GetMacroArea() const { switch (m_ActivePanel->GetType()) { diff --git a/far/filepanels.hpp b/far/filepanels.hpp index 946d9694a0..394523d74e 100644 --- a/far/filepanels.hpp +++ b/far/filepanels.hpp @@ -57,7 +57,7 @@ class FilePanels:public window,public ViewerContainer virtual void ResizeConsole() override; virtual bool CanFastHide() const override; virtual void Refresh() override; - virtual FARMACROAREA GetMacroMode() const override; + virtual FARMACROAREA GetMacroArea() const override; virtual Viewer* GetViewer(void) override; virtual Viewer* GetById(int ID) override; diff --git a/far/keyboard.cpp b/far/keyboard.cpp index a5657371e3..35aab11434 100644 --- a/far/keyboard.cpp +++ b/far/keyboard.cpp @@ -624,10 +624,10 @@ DWORD GetInputRecord(INPUT_RECORD *rec,bool ExcludeMacro,bool ProcessMouse,bool DWORD GetInputRecordNoMacroArea(INPUT_RECORD *rec,bool AllowSynchro) { - FARMACROAREA MMode = Global->CtrlObject->Macro.GetMode(); - Global->CtrlObject->Macro.SetMode(MACROAREA_LAST); // ÷òîáû íå ñðàáàòûâàëè ìàêðîñû :-) + FARMACROAREA MArea = Global->CtrlObject->Macro.GetArea(); + Global->CtrlObject->Macro.SetArea(MACROAREA_LAST); // ÷òîáû íå ñðàáàòûâàëè ìàêðîñû :-) DWORD Key = GetInputRecord(rec, false, false, AllowSynchro); - Global->CtrlObject->Macro.SetMode(MMode); + Global->CtrlObject->Macro.SetArea(MArea); return Key; } @@ -733,7 +733,7 @@ static DWORD __GetInputRecord(INPUT_RECORD *rec,bool ExcludeMacro,bool ProcessMo } int EnableShowTime=Global->Opt->Clock && (Global->WaitInMainLoop || (Global->CtrlObject && - Global->CtrlObject->Macro.GetMode()==MACROAREA_SEARCH)); + Global->CtrlObject->Macro.GetArea()==MACROAREA_SEARCH)); if (EnableShowTime) ShowTime(1); @@ -2893,7 +2893,7 @@ DWORD CalcKeyCode(const INPUT_RECORD* rec, int RealKey, int *NotMacros, bool Pro if (KeyCode>='0' && KeyCode<='9') { if (Global->WaitInFastFind > 0 && - Global->CtrlObject->Macro.GetCurRecord() < MACROSTATE_RECORDING && + Global->CtrlObject->Macro.GetState() < MACROSTATE_RECORDING && !Global->CtrlObject->Macro.MacroExists(KEY_ALTSHIFT0+KeyCode-'0',MACROAREA_SEARCH,true)) { return Modif|Char; diff --git a/far/macro.cpp b/far/macro.cpp index 5b1215c843..8f427e44a6 100644 --- a/far/macro.cpp +++ b/far/macro.cpp @@ -373,7 +373,7 @@ struct DlgParam { UINT64 Flags; DWORD Key; - FARMACROAREA Mode; + FARMACROAREA Area; int Recurse; bool Changed; }; @@ -481,9 +481,9 @@ static void SetMacroValue(const FarMacroValue& Value) CallMacroPluginSimple(&info); } -static bool TryToPostMacro(FARMACROAREA Mode,const string& TextKey,DWORD IntKey) +static bool TryToPostMacro(FARMACROAREA Area,const string& TextKey,DWORD IntKey) { - FarMacroValue values[] = {10.0,(double)Mode,TextKey.data(),(double)IntKey}; + FarMacroValue values[] = {10.0,(double)Area,TextKey.data(),(double)IntKey}; FarMacroCall fmc={sizeof(FarMacroCall),ARRAYSIZE(values),values,nullptr,nullptr}; OpenMacroPluginInfo info={MCT_KEYMACRO,&fmc}; return CallMacroPluginSimple(&info); @@ -497,7 +497,7 @@ static inline Panel* TypeToPanel(int Type) } KeyMacro::KeyMacro(): - m_Mode(MACROAREA_SHELL), + m_Area(MACROAREA_SHELL), m_RecMode(MACROAREA_OTHER), m_StartMode(MACROAREA_OTHER), m_Recording(MACROSTATE_NOMACRO), @@ -546,7 +546,7 @@ void KeyMacro::SetMacroConst(int ConstIndex, __int64 Value) msValues[ConstIndex] = Value; } -int KeyMacro::GetCurRecord() const +int KeyMacro::GetState() const { return (m_Recording != MACROSTATE_NOMACRO) ? m_Recording : IsExecuting(); } @@ -578,7 +578,7 @@ void KeyMacro::RestoreMacroChar() const This duplication take place since ShowEditor method will NOT send this event while screen is locked. */ - if (m_Mode==MACROAREA_EDITOR && + if (m_Area==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible() /* && LockScr*/) // Mantis#0001595 @@ -586,7 +586,7 @@ void KeyMacro::RestoreMacroChar() const Global->CtrlObject->Plugins->ProcessEditorEvent(EE_REDRAW,EEREDRAW_ALL,Global->WindowManager->GetCurrentEditor()->GetId()); Global->WindowManager->GetCurrentEditor()->Show(); } - else if (m_Mode==MACROAREA_VIEWER && + else if (m_Area==MACROAREA_VIEWER && Global->WindowManager->GetCurrentViewer() && Global->WindowManager->GetCurrentViewer()->IsVisible()) { @@ -603,9 +603,9 @@ struct GetMacroData MACROFLAGS_MFLAGS Flags; }; -static bool LM_GetMacro(GetMacroData* Data, FARMACROAREA Mode, const string& TextKey, bool UseCommon) +static bool LM_GetMacro(GetMacroData* Data, FARMACROAREA Area, const string& TextKey, bool UseCommon) { - FarMacroValue InValues[]={(double)Mode,TextKey,UseCommon}; + FarMacroValue InValues[]={(double)Area,TextKey,UseCommon}; FarMacroCall fmc={sizeof(FarMacroCall),ARRAYSIZE(InValues),InValues,nullptr,nullptr}; OpenMacroPluginInfo info={MCT_GETMACRO,&fmc}; @@ -625,17 +625,17 @@ static bool LM_GetMacro(GetMacroData* Data, FARMACROAREA Mode, const string& Tex return false; } -bool KeyMacro::MacroExists(int Key, FARMACROAREA CheckMode, bool UseCommon) +bool KeyMacro::MacroExists(int Key, FARMACROAREA Area, bool UseCommon) { GetMacroData dummy; string strKey; - return KeyToText(Key,strKey) && LM_GetMacro(&dummy,CheckMode,strKey,UseCommon); + return KeyToText(Key,strKey) && LM_GetMacro(&dummy,Area,strKey,UseCommon); } -static void LM_ProcessRecordedMacro(FARMACROAREA Mode, const string& TextKey, const string& Code, +static void LM_ProcessRecordedMacro(FARMACROAREA Area, const string& TextKey, const string& Code, MACROFLAGS_MFLAGS Flags, const string& Description) { - FarMacroValue values[]={(double)Mode,TextKey,Code,Flags,Description}; + FarMacroValue values[]={(double)Area,TextKey,Code,Flags,Description}; FarMacroCall fmc={sizeof(FarMacroCall),ARRAYSIZE(values),values,nullptr,nullptr}; OpenMacroPluginInfo info={MCT_RECORDEDMACRO,&fmc}; CallMacroPlugin(&info); @@ -667,7 +667,7 @@ int KeyMacro::ProcessEvent(const FAR_INPUT_RECORD *Rec) } // Ãäå ìû? - m_RecMode=(m_Mode==MACROAREA_SHELL&&!Global->WaitInMainLoop)?MACROAREA_OTHER:m_Mode; + m_RecMode=(m_Area==MACROAREA_SHELL&&!Global->WaitInMainLoop)?MACROAREA_OTHER:m_Area; m_StartMode=m_RecMode; //  çàâèñèìîñòè îò òîãî, ÊÀÊ ÍÀ×ÀËÈ ïèñàòü ìàêðîñ, ðàçëè÷àåì îáùèé ðåæèì (Ctrl-. // ñ ïåðåäà÷åé ïëàãèíó êååâ) èëè ñïåöèàëüíûé (Ctrl-Shift-. - áåç ïåðåäà÷è êëàâèø ïëàãèíó) @@ -696,7 +696,7 @@ int KeyMacro::ProcessEvent(const FAR_INPUT_RECORD *Rec) INPUT_RECORD RecCopy = Rec->Rec; - if (TryToPostMacro(m_Mode, textKey, Rec->IntKey)) + if (TryToPostMacro(m_Area, textKey, Rec->IntKey)) return true; // Mantis 0002307: Ïðè âûçîâå msgbox èç condition(), êëþ÷ çàêðûòèÿ msgbox ïåðåäà¸òñÿ äàëüøå (íå ñúåäàåòñÿ) @@ -792,7 +792,7 @@ int KeyMacro::GetKey() return 0; case MPRT_HASNOMACRO: - if (m_Mode==MACROAREA_EDITOR && + if (m_Area==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible() && Global->ScrBuf->GetLockCount()) @@ -893,9 +893,9 @@ int KeyMacro::PeekKey() const return !m_InternalInput && IsExecuting(); } -bool KeyMacro::GetMacroKeyInfo(const string& strMode, int Pos, string &strKeyName, string &strDescription) +bool KeyMacro::GetMacroKeyInfo(const string& StrArea, int Pos, string &strKeyName, string &strDescription) { - FarMacroValue values[]={strMode,!Pos}; + FarMacroValue values[]={StrArea,!Pos}; FarMacroCall fmc={sizeof(FarMacroCall),ARRAYSIZE(values),values,nullptr,nullptr}; OpenMacroPluginInfo info={MCT_ENUMMACROS,&fmc}; @@ -988,18 +988,18 @@ bool KeyMacro::PostNewMacro(const wchar_t* Sequence,FARKEYMACROFLAGS InputFlags, return CallMacroPluginSimple(&info); } -static BOOL CheckEditSelected(FARMACROAREA Mode, UINT64 CurFlags) +static BOOL CheckEditSelected(FARMACROAREA Area, UINT64 CurFlags) { - if (Mode==MACROAREA_EDITOR || Mode==MACROAREA_DIALOG || Mode==MACROAREA_VIEWER || (Mode==MACROAREA_SHELL&&Global->CtrlObject->CmdLine()->IsVisible())) + if (Area==MACROAREA_EDITOR || Area==MACROAREA_DIALOG || Area==MACROAREA_VIEWER || (Area==MACROAREA_SHELL&&Global->CtrlObject->CmdLine()->IsVisible())) { - int NeedType = Mode == MACROAREA_EDITOR?windowtype_editor:(Mode == MACROAREA_VIEWER?windowtype_viewer:(Mode == MACROAREA_DIALOG?windowtype_dialog:windowtype_panels)); + int NeedType = Area == MACROAREA_EDITOR?windowtype_editor:(Area == MACROAREA_VIEWER?windowtype_viewer:(Area == MACROAREA_DIALOG?windowtype_dialog:windowtype_panels)); auto CurrentWindow = Global->WindowManager->GetCurrentWindow(); if (CurrentWindow && CurrentWindow->GetType()==NeedType) { int CurSelected; - if (Mode==MACROAREA_SHELL && Global->CtrlObject->CmdLine()->IsVisible()) + if (Area==MACROAREA_SHELL && Global->CtrlObject->CmdLine()->IsVisible()) CurSelected=(int)Global->CtrlObject->CmdLine()->VMProcess(MCODE_C_SELECTED); else CurSelected=(int)CurrentWindow->VMProcess(MCODE_C_SELECTED); @@ -1059,7 +1059,7 @@ static BOOL CheckFileFolder(Panel *CheckPanel,UINT64 CurFlags, BOOL IsPassivePan return TRUE; } -static BOOL CheckAll (FARMACROAREA Mode, UINT64 CurFlags) +static BOOL CheckAll (FARMACROAREA Area, UINT64 CurFlags) { /* $TODO: Çäåñü âìåñòî Check*() ïîïðîáîâàòü çàþçàòü IfCondition() @@ -1099,7 +1099,7 @@ static BOOL CheckAll (FARMACROAREA Mode, UINT64 CurFlags) return FALSE; if (CurFlags&(MFLAGS_SELECTION|MFLAGS_NOSELECTION|MFLAGS_PSELECTION|MFLAGS_PNOSELECTION)) - if (Mode!=MACROAREA_EDITOR && Mode != MACROAREA_DIALOG && Mode!=MACROAREA_VIEWER) + if (Area!=MACROAREA_EDITOR && Area!=MACROAREA_DIALOG && Area!=MACROAREA_VIEWER) { size_t SelCount=ActivePanel->GetRealSelCount(); @@ -1113,7 +1113,7 @@ static BOOL CheckAll (FARMACROAREA Mode, UINT64 CurFlags) } } - if (!CheckEditSelected(Mode, CurFlags)) + if (!CheckEditSelected(Area, CurFlags)) return FALSE; return TRUE; @@ -1561,7 +1561,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) if (CheckCode == 0) { return PassNumber (Global->WaitInMainLoop ? - Global->WindowManager->GetCurrentWindow()->GetMacroMode() : GetMode(), Data); + Global->WindowManager->GetCurrentWindow()->GetMacroArea() : GetArea(), Data); } Panel *ActivePanel = Global->CtrlObject->Cp() ? Global->CtrlObject->Cp()->ActivePanel() : nullptr; @@ -1595,7 +1595,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) return PassNumber(Global->FarUpTime(), Data); case MCODE_V_MACRO_AREA: - return PassNumber(GetMode(), Data); + return PassNumber(GetArea(), Data); case MCODE_C_FULLSCREENMODE: // Fullscreen? return PassBoolean(IsConsoleFullscreen(), Data); @@ -1650,13 +1650,13 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) case MCODE_C_SELECTED: // Selected? { - int NeedType = m_Mode == MACROAREA_EDITOR? windowtype_editor : (m_Mode == MACROAREA_VIEWER? windowtype_viewer : (m_Mode == MACROAREA_DIALOG? windowtype_dialog : windowtype_panels)); + int NeedType = m_Area == MACROAREA_EDITOR? windowtype_editor : (m_Area == MACROAREA_VIEWER? windowtype_viewer : (m_Area == MACROAREA_DIALOG? windowtype_dialog : windowtype_panels)); - if (!(m_Mode == MACROAREA_USERMENU || m_Mode == MACROAREA_MAINMENU || m_Mode == MACROAREA_MENU) && CurrentWindow && CurrentWindow->GetType()==NeedType) + if (!(m_Area == MACROAREA_USERMENU || m_Area == MACROAREA_MAINMENU || m_Area == MACROAREA_MENU) && CurrentWindow && CurrentWindow->GetType()==NeedType) { int CurSelected; - if (m_Mode==MACROAREA_SHELL && Global->CtrlObject->CmdLine()->IsVisible()) + if (m_Area==MACROAREA_SHELL && Global->CtrlObject->CmdLine()->IsVisible()) CurSelected=(int)Global->CtrlObject->CmdLine()->VMProcess(CheckCode); else CurSelected=(int)CurrentWindow->VMProcess(CheckCode); @@ -1678,9 +1678,9 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) case MCODE_C_BOF: case MCODE_C_EOF: { - int CurMMode=GetMode(); + int CurArea=GetArea(); - if (!(m_Mode == MACROAREA_USERMENU || m_Mode == MACROAREA_MAINMENU || m_Mode == MACROAREA_MENU) && CurrentWindow && CurrentWindow->GetType() == windowtype_panels && !(CurMMode == MACROAREA_INFOPANEL || CurMMode == MACROAREA_QVIEWPANEL || CurMMode == MACROAREA_TREEPANEL)) + if (!(m_Area == MACROAREA_USERMENU || m_Area == MACROAREA_MAINMENU || m_Area == MACROAREA_MENU) && CurrentWindow && CurrentWindow->GetType() == windowtype_panels && !(CurArea == MACROAREA_INFOPANEL || CurArea == MACROAREA_QVIEWPANEL || CurArea == MACROAREA_TREEPANEL)) { if (CheckCode == MCODE_C_EMPTY) ret=Global->CtrlObject->CmdLine()->GetLength()?0:1; @@ -2051,7 +2051,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) case MCODE_V_MENU_VALUE: // Menu.Value case MCODE_V_MENUINFOID: // Menu.Info.Id { - int CurMMode=GetMode(); + int CurArea=GetArea(); const wchar_t* ptr = L""; if (CheckCode==MCODE_V_MENUINFOID && CurrentWindow && CurrentWindow->GetType()==windowtype_menu) @@ -2059,7 +2059,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) return PassString(reinterpret_cast(static_cast(CurrentWindow->VMProcess(MCODE_V_DLGINFOID))), Data); } - if (IsMenuArea(CurMMode) || CurMMode == MACROAREA_DIALOG) + if (IsMenuArea(CurArea) || CurArea == MACROAREA_DIALOG) { auto f = Global->WindowManager->GetCurrentWindow(); @@ -2111,7 +2111,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) if (CheckCode == MCODE_V_EDITORSELVALUE) ptr=L""; - if (GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { if (CheckCode == MCODE_V_EDITORFILENAME) { @@ -2136,7 +2136,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) case MCODE_V_HELPSELTOPIC: // Help.SelTopic { const wchar_t* ptr=L""; - if (GetMode() == MACROAREA_HELP) + if (GetArea() == MACROAREA_HELP) { CurrentWindow->VMProcess(CheckCode,&strFileName,0); ptr=strFileName.data(); @@ -2147,7 +2147,7 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) case MCODE_V_VIEWERFILENAME: // Viewer.FileName case MCODE_V_VIEWERSTATE: // Viewer.State { - if ((GetMode()==MACROAREA_VIEWER || GetMode()==MACROAREA_QVIEWPANEL) && + if ((GetArea()==MACROAREA_VIEWER || GetArea()==MACROAREA_QVIEWPANEL) && Global->WindowManager->GetCurrentViewer() && Global->WindowManager->GetCurrentViewer()->IsVisible()) { if (CheckCode == MCODE_V_VIEWERFILENAME) @@ -2389,9 +2389,9 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) tmpVar.toInteger(); - int CurMMode=GetMode(); + int CurArea=GetArea(); - if (IsMenuArea(CurMMode) || CurMMode == MACROAREA_DIALOG) + if (IsMenuArea(CurArea) || CurArea == MACROAREA_DIALOG) { auto f = Global->WindowManager->GetCurrentWindow(); @@ -2458,9 +2458,9 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) tmpMode--; } - int CurMMode=GetMode(); + int CurArea=GetArea(); - if (IsMenuArea(CurMMode) || CurMMode == MACROAREA_DIALOG) + if (IsMenuArea(CurArea) || CurArea == MACROAREA_DIALOG) { auto f = Global->WindowManager->GetCurrentWindow(); @@ -2483,9 +2483,9 @@ intptr_t KeyMacro::CallFar(intptr_t CheckCode, FarMacroCall* Data) if (tmpAction.isUnknown()) tmpAction=CheckCode == MCODE_F_MENU_FILTER ? 4 : 0; - int CurMMode=GetMode(); + int CurArea=GetArea(); - if (IsMenuArea(CurMMode) || CurMMode == MACROAREA_DIALOG) + if (IsMenuArea(CurArea) || CurArea == MACROAREA_DIALOG) { auto f = Global->WindowManager->GetCurrentWindow(); @@ -3741,7 +3741,7 @@ static bool dlgsetfocusFunc(FarMacroCall* Data) TVar Ret(-1); unsigned Index=(unsigned)Params[0].asInteger()-1; - if (Global->CtrlObject->Macro.GetMode() == MACROAREA_DIALOG) + if (Global->CtrlObject->Macro.GetArea() == MACROAREA_DIALOG) { if (auto Dlg = std::dynamic_pointer_cast(Global->WindowManager->GetCurrentWindow())) { @@ -3819,7 +3819,7 @@ static bool dlggetvalueFunc(FarMacroCall* Data) auto Params = parseParams<2>(Data); TVar Ret(-1); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_DIALOG) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_DIALOG) { // TODO: fix indentation if (auto Dlg = std::dynamic_pointer_cast(Global->WindowManager->GetCurrentWindow())) @@ -4010,7 +4010,7 @@ static bool editorposFunc(FarMacroCall* Data) int What = (int)Params[1].asInteger(); int Op = (int)Params[0].asInteger(); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { EditorInfo ei={sizeof(EditorInfo)}; Global->WindowManager->GetCurrentEditor()->EditorControl(ECTL_GETINFO,0,&ei); @@ -4122,7 +4122,7 @@ static bool editorsetFunc(FarMacroCall* Data) TVar& Value(Params[1]); int Index=(int)Params[0].asInteger(); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { long longState=-1L; @@ -5000,13 +5000,13 @@ static bool editorselFunc(FarMacroCall* Data) TVar& Opts(Params[1]); TVar& Action(Params[0]); - FARMACROAREA Mode=Global->CtrlObject->Macro.GetMode(); - int NeedType = Mode == MACROAREA_EDITOR?windowtype_editor:(Mode == MACROAREA_VIEWER?windowtype_viewer:(Mode == MACROAREA_DIALOG?windowtype_dialog:windowtype_panels)); // MACROAREA_SHELL? + FARMACROAREA Area=Global->CtrlObject->Macro.GetArea(); + int NeedType = Area == MACROAREA_EDITOR?windowtype_editor:(Area == MACROAREA_VIEWER?windowtype_viewer:(Area == MACROAREA_DIALOG?windowtype_dialog:windowtype_panels)); // MACROAREA_SHELL? auto CurrentWindow = Global->WindowManager->GetCurrentWindow(); if (CurrentWindow && CurrentWindow->GetType()==NeedType) { - if (Mode==MACROAREA_SHELL && Global->CtrlObject->CmdLine()->IsVisible()) + if (Area==MACROAREA_SHELL && Global->CtrlObject->CmdLine()->IsVisible()) Ret=Global->CtrlObject->CmdLine()->VMProcess(MCODE_F_EDITOR_SEL,ToPtr(Action.toInteger()),Opts.asInteger()); else Ret=CurrentWindow->VMProcess(MCODE_F_EDITOR_SEL,ToPtr(Action.toInteger()),Opts.asInteger()); @@ -5023,7 +5023,7 @@ static bool editorundoFunc(FarMacroCall* Data) TVar Ret(0ll); TVar& Action(Params[0]); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { EditorUndoRedo eur={sizeof(EditorUndoRedo)}; eur.Command=static_cast(Action.toInteger()); @@ -5041,7 +5041,7 @@ static bool editorsettitleFunc(FarMacroCall* Data) TVar Ret(0ll); TVar& Title(Params[0]); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { if (Title.isInteger() && !Title.asInteger()) { @@ -5062,7 +5062,7 @@ static bool editordellineFunc(FarMacroCall* Data) TVar Ret(0ll); TVar& Line(Params[0]); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { if (Line.isNumber()) { @@ -5082,7 +5082,7 @@ static bool editorinsstrFunc(FarMacroCall* Data) TVar& S(Params[0]); TVar& Line(Params[1]); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { if (Line.isNumber()) { @@ -5108,7 +5108,7 @@ static bool editorsetstrFunc(FarMacroCall* Data) TVar& S(Params[0]); TVar& Line(Params[1]); - if (Global->CtrlObject->Macro.GetMode()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) + if (Global->CtrlObject->Macro.GetArea()==MACROAREA_EDITOR && Global->WindowManager->GetCurrentEditor() && Global->WindowManager->GetCurrentEditor()->IsVisible()) { if (Line.isNumber()) { @@ -5319,7 +5319,7 @@ intptr_t KeyMacro::AssignMacroDlgProc(Dialog* Dlg,intptr_t Msg,intptr_t Param1,v // åñëè ÓÆÅ åñòü òàêîé ìàêðîñ... GetMacroData Data; - if (LM_GetMacro(&Data,KMParam->Mode,strKeyText,true) && Data.MacroId) + if (LM_GetMacro(&Data,KMParam->Area,strKeyText,true) && Data.MacroId) { // îáùèå ìàêðîñû ó÷èòûâàåì òîëüêî ïðè óäàëåíèè. if (m_RecCode.empty() || Data.Area!=MACROAREA_COMMON_INTERNAL) diff --git a/far/macro.hpp b/far/macro.hpp index 338ebd62e3..d581445ccd 100644 --- a/far/macro.hpp +++ b/far/macro.hpp @@ -71,11 +71,11 @@ class KeyMacro: noncopyable static bool AddMacro(const GUID& PluginId,const MacroAddMacro* Data); static bool DelMacro(const GUID& PluginId,void* Id); static bool ExecuteString(MacroExecuteString *Data); - static bool GetMacroKeyInfo(const string& strMode,int Pos,string &strKeyName,string &strDescription); + static bool GetMacroKeyInfo(const string& strArea,int Pos,string &strKeyName,string &strDescription); static int IsDisableOutput(); static int IsExecuting(); static bool IsHistoryDisable(int TypeHistory); - static bool MacroExists(int Key, FARMACROAREA CheckMode, bool UseCommon); + static bool MacroExists(int Key, FARMACROAREA Area, bool UseCommon); static void RunStartMacro(); static bool SaveMacros(bool always); static void SendDropProcess(); @@ -84,17 +84,17 @@ class KeyMacro: noncopyable intptr_t CallFar(intptr_t OpCode, FarMacroCall* Data); bool CheckWaitKeyFunc() const; - int GetCurRecord() const; + int GetState() const; int GetKey(); void GetMacroParseError(DWORD* ErrCode, COORD* ErrPos, string *ErrSrc) const; - FARMACROAREA GetMode() const { return m_Mode; } + FARMACROAREA GetArea() const { return m_Area; } const wchar_t* GetStringToPrint() const { return m_StringToPrint; } int IsRecording() const { return m_Recording; } bool LoadMacros(bool FromFar, bool InitedRAM=true, const FarMacroLoad *Data=nullptr); bool ParseMacroString(const wchar_t* Sequence,FARKEYMACROFLAGS Flags,bool skipFile); int PeekKey() const; int ProcessEvent(const FAR_INPUT_RECORD *Rec); - void SetMode(FARMACROAREA Mode) { m_Mode=Mode; } + void SetArea(FARMACROAREA Area) { m_Area=Area; } void SuspendMacros(bool Suspend) { Suspend ? ++m_InternalInput : --m_InternalInput; } private: @@ -104,7 +104,7 @@ class KeyMacro: noncopyable intptr_t ParamMacroDlgProc(Dialog* Dlg,intptr_t Msg,intptr_t Param1,void* Param2); void RestoreMacroChar() const; - FARMACROAREA m_Mode; + FARMACROAREA m_Area; FARMACROAREA m_RecMode; FARMACROAREA m_StartMode; FARMACROSTATE m_Recording; diff --git a/far/manager.cpp b/far/manager.cpp index e51983c825..d84de21d77 100644 --- a/far/manager.cpp +++ b/far/manager.cpp @@ -1220,7 +1220,7 @@ void Manager::InitKeyBar() void Manager::UpdateMacroArea(void) { - if (m_currentWindow) Global->CtrlObject->Macro.SetMode(m_currentWindow->GetMacroMode()); + if (m_currentWindow) Global->CtrlObject->Macro.SetArea(m_currentWindow->GetMacroArea()); } Manager::sorted_windows Manager::GetSortedWindows(void) const diff --git a/far/plugapi.cpp b/far/plugapi.cpp index 1cf43d9843..da8590c713 100644 --- a/far/plugapi.cpp +++ b/far/plugapi.cpp @@ -2473,13 +2473,13 @@ intptr_t WINAPI apiMacroControl(const GUID* PluginId, FAR_MACRO_CONTROL_COMMANDS // Param1=0, Param2 - 0 case MCTL_GETSTATE: { - return Macro.GetCurRecord(); + return Macro.GetState(); } // Param1=0, Param2 - 0 case MCTL_GETAREA: { - return Macro.GetMode(); + return Macro.GetArea(); } case MCTL_ADDMACRO: diff --git a/far/vbuild.m4 b/far/vbuild.m4 index 4072dca21a..e1ea317750 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,4252)m4_dnl +m4_define(BUILD,4253)m4_dnl diff --git a/far/window.cpp b/far/window.cpp index 60a8fcca51..a2a0f33373 100644 --- a/far/window.cpp +++ b/far/window.cpp @@ -51,7 +51,7 @@ window::window(): m_windowKeyBar(nullptr), m_Deleting(false), m_BlockCounter(0), - m_MacroMode(MACROAREA_OTHER) + m_MacroArea(MACROAREA_OTHER) { _OT(SysLog(L"[%p] window::window()", this)); } @@ -124,5 +124,5 @@ bool window::IsPinned(void) const void window::SetMacroMode(FARMACROAREA Area) { - m_MacroMode=Area; + m_MacroArea=Area; } diff --git a/far/window.hpp b/far/window.hpp index af34a6185e..95633c922d 100644 --- a/far/window.hpp +++ b/far/window.hpp @@ -68,7 +68,7 @@ class window: public ScreenObjectWithShadow, public std::enable_shared_from_this virtual void OnChangeFocus(bool focus); // âûçûâàåòñÿ ïðè ñìåíå ôîêóñà virtual void InitKeyBar() {} virtual void RedrawKeyBar() { UpdateKeyBar(); } - virtual FARMACROAREA GetMacroMode() const { return m_MacroMode; } + virtual FARMACROAREA GetMacroArea() const { return m_MacroArea; } virtual bool CanFastHide() const; virtual string GetTitle() const = 0; virtual bool ProcessEvents() {return true;} @@ -106,5 +106,5 @@ class window: public ScreenObjectWithShadow, public std::enable_shared_from_this bool m_Deleting; long m_BlockCounter; - FARMACROAREA m_MacroMode; + FARMACROAREA m_MacroArea; };