1. событие FARMACRO_KEY_EVENT удалено.

2. временное уточнение 4318 для нажатий shift/alt/ctrl.
FarGroup · Mar 20, 2015 · 516c027 · 516c027
1 parent b90c884
commit 516c027
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 62 deletions.
diff --git a/enc/enc_rus3.work/meta/defs/farmacro_key_event.html b/enc/enc_rus3.work/meta/defs/farmacro_key_event.html
diff --git a/enc/enc_rus3.work/meta/defs/index.html b/enc/enc_rus3.work/meta/defs/index.html
@@ -55,10 +55,6 @@
 <td class="cont" width="60%">èíäåêñû öâåòîâ â öâåòîâîé ñõåìå (ôàéë <code>farcolor.hpp</code>)</td>
 </tr>
 <tr>
-<td class="cont" width="40%"><a href="farmacro_key_event.html">FARMACRO_KEY_EVENT</a></td>
-<td class="cont" width="60%">òèï âõîäíîãî ñîáûòèÿ, ïåðåäàâàåìîãî âî âðåìÿ èñïîëíåíèÿ ìàêðîêîìàíäû</td>
-</tr>
-<tr>
 <td class="cont" width="40%"><a href="macroopcode.html">MACROOPCODE</a></td>
 <td class="cont" width="60%">êîäû îïåðàöèé ìàêðîäâèæêà</td>
 <tr>

diff --git a/enc/enc_rus3.work/meta/winapi/input_record.html b/enc/enc_rus3.work/meta/winapi/input_record.html
@@ -70,17 +70,12 @@ <h1>INPUT_RECORD</h1>
 <td class="cont" width="60%">Ýëåìåíò Event ñîäåðæèò ñòðóêòóðó <a href="focus_event_record.html">FOCUS_EVENT_RECORD</a>.
         Ýòè ñîîáùåíèÿ èñïîëüçóþòñÿ ñèñòåìîé è äîëæíû èãíîðèðîâàòüñÿ.</td>
 </tr>
-<tr class="cont"><td class="cont" width="40%">FARMACRO_KEY_EVENT</td>
-<td class="cont" width="60%">Ýëåìåíò Event ñîäåðæèò ñòðóêòóðó <a href="key_event_record.html">KEY_EVENT_RECORD</a>
-        ñ èíôîðìàöèåé î ñîîáùåíèè ñ êëàâèàòóðû. <font color="red">Ýòî ñîîáùåíèå, ñïåöèôè÷íîå äëÿ Far Manager, ïðèõîäèò ïëàãèíó âî âðåìÿ "ïðîèãðûâàíèÿ" ìàêðîêîìàíäû.</font>
-        </td>
-</tr>
 </table>
     </div>
 
     <div class=dfn>Event</div>
     <div class=dfndescr>Ñîäåðæèò ñòðóêòóðû <code>KEY_EVENT_RECORD</code>, <code>MOUSE_EVENT_RECORD</code>, <code>WINDOW_BUFFER_SIZE_RECORD</code>,
-      <code>MENU_EVENT_RECORD</code>, <code>FOCUS_EVENT_RECORD</code> èëè <code>FARMACRO_KEY_EVENT</code>, â çàâèñèìîñòè îò çíà÷åíèÿ,
+      <code>MENU_EVENT_RECORD</code> èëè <code>FOCUS_EVENT_RECORD</code>, â çàâèñèìîñòè îò çíà÷åíèÿ,
       óêàçàííîãî â <code>EventType</code>.
     </div>
 </div>

diff --git a/far/PluginA.cpp b/far/PluginA.cpp
@@ -4432,7 +4432,6 @@ static int WINAPI FarEditorControlA(oldfar::EDITOR_CONTROL_COMMANDS OldCommand,
 					switch (pIR->EventType)
 					{
 						case KEY_EVENT:
-						case FARMACRO_KEY_EVENT:
 						{
 							wchar_t res;
 							if (MultiByteToWideChar(
@@ -4469,7 +4468,6 @@ static int WINAPI FarEditorControlA(oldfar::EDITOR_CONTROL_COMMANDS OldCommand,
 					switch (pIR->EventType)
 					{
 						case KEY_EVENT:
-						case FARMACRO_KEY_EVENT:
 						{
 							char res;
 							if (WideCharToMultiByte(

diff --git a/far/PluginW.pas b/far/PluginW.pas
@@ -104,8 +104,6 @@ interface
   TGuidsArray = packed array[0..Pred(MaxLongint div SizeOf(TGUID))] of TGUID;
 
 const
-  FARMACRO_KEY_EVENT = KEY_EVENT or $8000;
-
   CP_UNICODE    = 1200;
   CP_REVERSEBOM = 1201;
   CP_DEFAULT    = TUIntPtr(-1);

diff --git a/far/changelog b/far/changelog
@@ -1,4 +1,10 @@
-drkns 20.03.2015 09:36:40 +0200 - build 4320
+zg 21.03.2015 00:32:43 +0200 - build 4321
+
+1. событие FARMACRO_KEY_EVENT удалено.
+
+2. временное уточнение 4318 для нажатий shift/alt/ctrl.
+
+drkns 20.03.2015 09:36:40 +0200 - build 4320
 
 1. Продолжение 4309.
 

diff --git a/far/fileedit.cpp b/far/fileedit.cpp
@@ -2769,7 +2769,7 @@ intptr_t FileEditor::EditorControl(int Command, intptr_t Param1, void *Param2)
 				{
 					DWORD Key=GetInputRecord(rec);
 
-					if ((!rec->EventType || rec->EventType == KEY_EVENT || rec->EventType == FARMACRO_KEY_EVENT) &&
+					if ((!rec->EventType || rec->EventType == KEY_EVENT) &&
 					        ((Key >= KEY_MACRO_BASE && Key <= KEY_MACRO_ENDBASE) || (Key>=KEY_OP_BASE && Key <=KEY_OP_ENDBASE))) // èñêëþ÷àåì MACRO
 						ReProcessKey(Manager::Key(Key, *rec));
 					else
@@ -2782,8 +2782,7 @@ intptr_t FileEditor::EditorControl(int Command, intptr_t Param1, void *Param2)
 
 				if (rec->EventType == KEY_EVENT)
 				{
-					SysLog(L"ECTL_READINPUT={%s,{%d,%d,Vk=0x%04X,0x%08X}}",
-					       (rec->EventType == FARMACRO_KEY_EVENT?L"FARMACRO_KEY_EVENT":L"KEY_EVENT"),
+					SysLog(L"ECTL_READINPUT={KEY_EVENT,{%d,%d,Vk=0x%04X,0x%08X}}",
 					       rec->Event.KeyEvent.bKeyDown,
 					       rec->Event.KeyEvent.wRepeatCount,
 					       rec->Event.KeyEvent.wVirtualKeyCode,
@@ -2811,10 +2810,10 @@ intptr_t FileEditor::EditorControl(int Command, intptr_t Param1, void *Param2)
 				{
 #if defined(SYSLOG_KEYMACRO)
 
-					if (!rec.EventType || rec.EventType == KEY_EVENT || rec.EventType == FARMACRO_KEY_EVENT)
+					if (!rec.EventType || rec.EventType == KEY_EVENT)
 					{
 						SysLog(L"ECTL_PROCESSINPUT={%s,{%d,%d,Vk=0x%04X,0x%08X}}",
-						       (rec.EventType == FARMACRO_KEY_EVENT?L"FARMACRO_KEY_EVENT":L"KEY_EVENT"),
+						       (rec.EventType == KEY_EVENT?L"KEY_EVENT":L"(internal, macro)_KEY_EVENT"),
 						       rec.Event.KeyEvent.bKeyDown,
 						       rec.Event.KeyEvent.wRepeatCount,
 						       rec.Event.KeyEvent.wVirtualKeyCode,

diff --git a/far/keyboard.cpp b/far/keyboard.cpp
@@ -679,7 +679,7 @@ static DWORD __GetInputRecord(INPUT_RECORD *rec,bool ExcludeMacro,bool ProcessMo
 				Global->ScrBuf->Flush();
 				int VirtKey,ControlState;
 				TranslateKeyToVK(MacroKey,VirtKey,ControlState,rec);
-				rec->EventType=((((unsigned int)MacroKey >= KEY_MACRO_BASE && (unsigned int)MacroKey <= KEY_MACRO_ENDBASE) || ((unsigned int)MacroKey>=KEY_OP_BASE && (unsigned int)MacroKey <=KEY_OP_ENDBASE)) || (MacroKey&(~0xFF000000)) >= KEY_END_FKEY)?0:FARMACRO_KEY_EVENT;
+				rec->EventType=((((unsigned int)MacroKey >= KEY_MACRO_BASE && (unsigned int)MacroKey <= KEY_MACRO_ENDBASE) || ((unsigned int)MacroKey>=KEY_OP_BASE && (unsigned int)MacroKey <=KEY_OP_ENDBASE)) || (MacroKey&(~0xFF000000)) >= KEY_END_FKEY)?0:KEY_EVENT;
 
 				if (!(MacroKey&KEY_SHIFT))
 					IntKeyState.ShiftPressed=0;
@@ -1114,6 +1114,34 @@ static DWORD __GetInputRecord(INPUT_RECORD *rec,bool ExcludeMacro,bool ProcessMo
 				}
 			}
 
+			//BUGBUG: ãðÿçíûé õàê. âñ¸ ñâÿçàííîå ñ CAS íàäî âûíîñèòü îòñþäà.
+			if (Key!=-1)
+			{
+				rec->Event.KeyEvent.bKeyDown=1;
+				switch (Key)
+				{
+					case KEY_SHIFT:
+					case KEY_RSHIFT:
+					    rec->Event.KeyEvent.dwControlKeyState|=SHIFT_PRESSED;
+						break;
+					case KEY_CTRL:
+					    rec->Event.KeyEvent.dwControlKeyState|=LEFT_CTRL_PRESSED;
+						break;
+					case KEY_RCTRL:
+					    rec->Event.KeyEvent.dwControlKeyState|=RIGHT_CTRL_PRESSED;
+						break;
+					case KEY_ALT:
+					    rec->Event.KeyEvent.dwControlKeyState|=LEFT_ALT_PRESSED;
+						break;
+					case KEY_RALT:
+					    rec->Event.KeyEvent.dwControlKeyState|=RIGHT_ALT_PRESSED;
+						break;
+					default:
+						assert(false);
+						break;
+				}
+			}
+
 			{
 				_KEYMACRO(SysLog(L"[%d] CALL Global->CtrlObject->Macro.ProcessEvent(%s)",__LINE__,_FARKEY_ToName(Key)));
 				if(Global->WindowManager)
@@ -2216,7 +2244,7 @@ DWORD CalcKeyCode(const INPUT_RECORD* rec, int RealKey, int *NotMacros, bool Pro
 
 //  CtrlState&=~0x80000000;
 
-	if (!(rec->EventType==KEY_EVENT || rec->EventType == FARMACRO_KEY_EVENT || rec->EventType == MOUSE_EVENT))
+	if (!(rec->EventType==KEY_EVENT || rec->EventType == MOUSE_EVENT))
 		return KEY_NONE;
 
 	if (!RealKey)

diff --git a/far/plugin.hpp b/far/plugin.hpp
@@ -59,8 +59,6 @@ other possible license with no implications from the above license on them.
 
 #undef DefDlgProc
 
-#define FARMACRO_KEY_EVENT  (KEY_EVENT|0x8000)
-
 #ifdef FAR_USE_INTERNALS
 struct FAR_INPUT_RECORD
 {

diff --git a/far/syslog.cpp b/far/syslog.cpp
@@ -1698,14 +1698,13 @@ string __INPUT_RECORD_Dump(const INPUT_RECORD *rec)
 			    rec->Event.MenuEvent.dwCommandId
 			);
 			break;
-		case FARMACRO_KEY_EVENT:
 		case KEY_EVENT:
 		case 0:
 		{
 			WORD AsciiChar = (WORD)(BYTE)rec->Event.KeyEvent.uChar.AsciiChar;
 			Records = str_printf(
 			    L"%s: %s, %d, Vk=%s, Scan=0x%04X uChar=[U='%c' (0x%04X): A='%C' (0x%02X)] Ctrl=0x%08X (%c%c%c%c%c - %c%c%c%c)",
-			    (rec->EventType==KEY_EVENT?L"KEY_EVENT_RECORD":(rec->EventType==FARMACRO_KEY_EVENT?L"FARMACRO_KEY_EVENT":L"(internal, macro)_KEY_EVENT")),
+			    (rec->EventType==KEY_EVENT?L"KEY_EVENT_RECORD":L"(internal, macro)_KEY_EVENT"),
 			    (rec->Event.KeyEvent.bKeyDown?L"Dn":L"Up"),
 			    rec->Event.KeyEvent.wRepeatCount,
 			    _VK_KEY_ToName(rec->Event.KeyEvent.wVirtualKeyCode),

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4320)m4_dnl
+m4_define(BUILD,4321)m4_dnl
diff --git a/plugins/luamacro/farapi.lua b/plugins/luamacro/farapi.lua
@@ -13,8 +13,6 @@ enum {
   FARMANAGERVERSION_BUILD = 3674,
 };
 
-static const uint32_t FARMACRO_KEY_EVENT = (KEY_EVENT|0x8000);
-
 enum {
   CP_UNICODE    = 1200,
   CP_REVERSEBOM = 1201,

diff --git a/plugins/luamacro/luafar/service.c b/plugins/luamacro/luafar/service.c
@@ -1419,7 +1419,6 @@ void PushInputRecord(lua_State *L, const INPUT_RECORD* ir)
 	switch(ir->EventType)
 	{
 		case KEY_EVENT:
-		case FARMACRO_KEY_EVENT:
 			PutBoolToTable(L,"KeyDown", ir->Event.KeyEvent.bKeyDown);
 			PutNumToTable(L, "RepeatCount", ir->Event.KeyEvent.wRepeatCount);
 			PutNumToTable(L, "VirtualKeyCode", ir->Event.KeyEvent.wVirtualKeyCode);

diff --git a/plugins/proclist/Pclass.cpp b/plugins/proclist/Pclass.cpp
@@ -1161,7 +1161,7 @@ bool Plist::Connect(LPCTSTR pMachine, LPCTSTR pUser, LPCTSTR pPasw)
 
 int Plist::ProcessKey(const INPUT_RECORD *Rec)
 {
-	if (!(Rec->EventType == KEY_EVENT || Rec->EventType == FARMACRO_KEY_EVENT))
+	if (Rec->EventType != KEY_EVENT)
 		return FALSE;
 
 	int Key=Rec->Event.KeyEvent.wVirtualKeyCode;

diff --git a/plugins/proclist/changelog b/plugins/proclist/changelog
@@ -1,3 +1,7 @@
+zg 20.03.2015 23:42:22 +0200 - build 181
+
+1. Far 3.0 API 4321
+
 drkns 13.11.2013 22:09:58 +0200 - build 180
 
 1. ������� DisableThreadLibraryCalls.

diff --git a/plugins/proclist/version.hpp b/plugins/proclist/version.hpp
@@ -1,6 +1,6 @@
 #include "farversion.hpp"
 
-#define PLUGIN_BUILD 180
+#define PLUGIN_BUILD 181
 #define PLUGIN_DESC L"Process List for FAR Manager"
 #define PLUGIN_NAME L"ProcList"
 #define PLUGIN_FILENAME L"ProcList.dll"

diff --git a/plugins/tmppanel/TmpClass.cpp b/plugins/tmppanel/TmpClass.cpp
@@ -635,7 +635,7 @@ bool TmpPanel::IsCurrentFileCorrect(wchar_t **pCurFileName)
 
 int TmpPanel::ProcessKey(const INPUT_RECORD *Rec)
 {
-	if (!(Rec->EventType == KEY_EVENT || Rec->EventType == FARMACRO_KEY_EVENT))
+	if (Rec->EventType != KEY_EVENT)
 		return FALSE;
 
 	int Key=Rec->Event.KeyEvent.wVirtualKeyCode;

diff --git a/plugins/tmppanel/changelog b/plugins/tmppanel/changelog
@@ -1,3 +1,7 @@
+zg 20.03.2015 23:41:34 +0200 - build 105
+
+1. Far 3.0 API 4321
+
 shmuel 26.01.2015 16:42:07 +0200 - build 104
 
 1. ��������� build 87 (� ���� ����� ������� ���������� ������ ������

diff --git a/plugins/tmppanel/version.hpp b/plugins/tmppanel/version.hpp
@@ -1,6 +1,6 @@
 #include "farversion.hpp"
 
-#define PLUGIN_BUILD 104
+#define PLUGIN_BUILD 105
 #define PLUGIN_DESC L"Temporary Panel for Far Manager"
 #define PLUGIN_NAME L"TmpPanel"
 #define PLUGIN_FILENAME L"TmpPanel.dll"