Рефакторинг.

FarGroup · Mar 8, 2016 · 6f7075f · 6f7075f
1 parent 82a1472
commit 6f7075f
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 22 deletions.
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 1, 0, 0, 563 },
+    Version       = { 1, 0, 0, 564 },
     MinFarVersion = { 3, 0, 0, 4450 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/api.lua b/plugins/luamacro/api.lua
@@ -7,7 +7,7 @@ local MCODE_F_USERMENU = 0x80C66
 local MCODE_F_FAR_GETCONFIG = 0x80C69
 local F=far.Flags
 local band,bor = bit64.band,bit64.bor
-local MacroCallFar = far.MacroCallFar
+local MacroCallFar = Shared.MacroCallFar
 
 local function SetProperties (namespace, proptable)
   local meta = { __metatable="access denied", __newindex=function() end }
@@ -349,7 +349,7 @@ Plugin = {
 
   SyncCall = function(...)
     local v = Shared.keymacro.CallPlugin(Shared.pack(...), false)
-    if type(v)=="userdata" then return far.FarMacroCallToLua(v) else return v end
+    if type(v)=="userdata" then return Shared.FarMacroCallToLua(v) else return v end
   end
 }
 --------------------------------------------------------------------------------

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 07.03.2016 19:41:34 +0200 - build 563
+shmuel 08.03.2016 23:42:18 +0200 - build 564
+
+1. Рефакторинг.
+
+shmuel 07.03.2016 19:41:34 +0200 - build 563
 
 1. LuaFAR: продолжение M#3175.
    - Убрана функция win.DeleteRegKeyEx.

diff --git a/plugins/luamacro/keymacro.lua b/plugins/luamacro/keymacro.lua
@@ -4,6 +4,8 @@ local Shared = ...
 local Msg, ErrMsg = Shared.Msg, Shared.ErrMsg
 local MacroInit, MacroStep = Shared.MacroInit, Shared.MacroStep
 local pack, loadmacro, utils = Shared.pack, Shared.loadmacro, Shared.utils
+local MacroCallFar = Shared.MacroCallFar
+local FarMacroCallToLua = Shared.FarMacroCallToLua
 Shared = nil
 
 local F = far.Flags
@@ -26,22 +28,20 @@ local MCODE_F_PLUGIN_CALL = 0x80C4F
 local type, setmetatable = type, setmetatable
 local bit = bit or bit64
 local band, bor, bxor, lshift = bit.band, bit.bor, bit.bxor, bit.lshift
-local far_MacroCallFar = far.MacroCallFar
-local far_FarMacroCallToLua = far.FarMacroCallToLua
 --------------------------------------------------------------------------------
 
 local MCODE_F_KEYMACRO = 0x80C68
 local Import = {
-  RestoreMacroChar        = function()  return far_MacroCallFar(MCODE_F_KEYMACRO, 1) end,
-  ScrBufLock              = function()  return far_MacroCallFar(MCODE_F_KEYMACRO, 2) end,
-  ScrBufUnlock            = function()  return far_MacroCallFar(MCODE_F_KEYMACRO, 3) end,
-  ScrBufResetLockCount    = function()  return far_MacroCallFar(MCODE_F_KEYMACRO, 4) end,
-  ScrBufGetLockCount      = function()  return far_MacroCallFar(MCODE_F_KEYMACRO, 5) end,
-  ScrBufSetLockCount      = function(v) return far_MacroCallFar(MCODE_F_KEYMACRO, 6, v) end,
-  GetUseInternalClipboard = function()  return far_MacroCallFar(MCODE_F_KEYMACRO, 7) end,
-  SetUseInternalClipboard = function(v) return far_MacroCallFar(MCODE_F_KEYMACRO, 8, v) end,
-  KeyNameToKey            = function(v) return far_MacroCallFar(MCODE_F_KEYMACRO, 9, v) end,
-  KeyToText               = function(v) return far_MacroCallFar(MCODE_F_KEYMACRO, 10, v) end,
+  RestoreMacroChar        = function()  return MacroCallFar(MCODE_F_KEYMACRO, 1) end,
+  ScrBufLock              = function()  return MacroCallFar(MCODE_F_KEYMACRO, 2) end,
+  ScrBufUnlock            = function()  return MacroCallFar(MCODE_F_KEYMACRO, 3) end,
+  ScrBufResetLockCount    = function()  return MacroCallFar(MCODE_F_KEYMACRO, 4) end,
+  ScrBufGetLockCount      = function()  return MacroCallFar(MCODE_F_KEYMACRO, 5) end,
+  ScrBufSetLockCount      = function(v) return MacroCallFar(MCODE_F_KEYMACRO, 6, v) end,
+  GetUseInternalClipboard = function()  return MacroCallFar(MCODE_F_KEYMACRO, 7) end,
+  SetUseInternalClipboard = function(v) return MacroCallFar(MCODE_F_KEYMACRO, 8, v) end,
+  KeyNameToKey            = function(v) return MacroCallFar(MCODE_F_KEYMACRO, 9, v) end,
+  KeyToText               = function(v) return MacroCallFar(MCODE_F_KEYMACRO, 10, v) end,
 }
 --------------------------------------------------------------------------------
 
@@ -255,7 +255,7 @@ local function GetInputFromMacro()
     local value, handle = macro:GetValue(), macro:GetHandle()
     local r1,r2
     if type(value) == "userdata" then  -- Plugin.Call/SyncCall
-      r1,r2 = MacroStep(handle, far_FarMacroCallToLua(value))
+      r1,r2 = MacroStep(handle, FarMacroCallToLua(value))
     elseif type(value) == "table" then -- mf.acall, eval
       r1,r2 = MacroStep(handle, unpack(value,1,value.n))
     elseif value ~= nil then           -- Plugin.Menu/Config/Command, ...
@@ -384,7 +384,7 @@ function KeyMacro.CallPlugin (Params, AsyncCall)
 
     local lockCount = Import.ScrBufGetLockCount()
     Import.ScrBufSetLockCount(0)
-    local ResultCallPlugin = far_MacroCallFar(MCODE_F_PLUGIN_CALL, AsyncCall, unpack(Params,1,Params.n))
+    local ResultCallPlugin = MacroCallFar(MCODE_F_PLUGIN_CALL, AsyncCall, unpack(Params,1,Params.n))
     Import.ScrBufSetLockCount(lockCount)
 
     local isSynchroCall = true

diff --git a/plugins/luamacro/luamacro.lua b/plugins/luamacro/luamacro.lua
@@ -440,6 +440,8 @@ end
 local function Init()
   Shared = { ErrMsg=ErrMsg, pack=pack, checkarg=checkarg, loadmacro=loadmacro, yieldcall=yieldcall,
              MacroInit=MacroInit, MacroStep=MacroStep, ExpandEnv=ExpandEnv }
+  Shared.MacroCallFar, far.MacroCallFar = far.MacroCallFar, nil
+  Shared.FarMacroCallToLua, far.FarMacroCallToLua = far.FarMacroCallToLua, nil
 
   local ModuleDir = far.PluginStartupInfo().ModuleDir
   local function RunPluginFile (fname, param)

diff --git a/plugins/luamacro/luamacro.rc b/plugins/luamacro/luamacro.rc
@@ -1,6 +1,6 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 563
+#define PLUGIN_BUILD 564
 #define PLUGIN_DESC "Lua Macros for Far Manager"
 #define PLUGIN_NAME "LuaMacro"
 #define PLUGIN_FILENAME "luamacro.dll"

diff --git a/plugins/luamacro/mbrowser.lua b/plugins/luamacro/mbrowser.lua
@@ -221,7 +221,7 @@ local function MenuLoop()
             check = filename and utils.CheckFileName(m.filemask, filename)
           end
           if check then
-            if far.MacroCallFar(MCODE_F_CHECKALL, area, m.flags, m.callback, m.callbackId) then
+            if Shared.MacroCallFar(MCODE_F_CHECKALL, area, m.flags, m.callback, m.callbackId) then
               if not m.keyregex then
                 local key1 = m.key:match("%S+")
                 if (not m.condition or m.condition(key1)) then

diff --git a/plugins/luamacro/panelsort.lua b/plugins/luamacro/panelsort.lua
@@ -109,7 +109,7 @@ local function SetCustomSortMode (nMode, whatpanel)
   local Settings = CustomSortModes[nMode]
   if Settings then
     whatpanel = whatpanel==1 and 1 or 0
-    far.MacroCallFar(MCODE_F_SETCUSTOMSORTMODE, whatpanel, nMode, Settings.InvertByDefault)
+    Shared.MacroCallFar(MCODE_F_SETCUSTOMSORTMODE, whatpanel, nMode, Settings.InvertByDefault)
   end
 end
 

diff --git a/plugins/luamacro/utils.lua b/plugins/luamacro/utils.lua
@@ -5,7 +5,7 @@ local F = far.Flags
 local type = type
 local string_find, string_sub = string.find, string.sub
 local band, bor = bit64.band, bit64.bor
-local MacroCallFar = far.MacroCallFar
+local MacroCallFar = Shared.MacroCallFar
 local gmeta = { __index=_G }
 local LastMessage = {}
 --------------------------------------------------------------------------------