1. 0002760: Отдельные макрообласти для GRABBER, HMENU, DESKTOP.

2. 0002761: Отдать в АПИ константы WTYPE_GRABBER, WTYPE_HMENU, WTYPE_DESKTOP, WTYPE_FINDFOLDER.
FarGroup · Oct 16, 2017 · 34d3d64 · 34d3d64
1 parent c5851c8
commit 34d3d64
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,9 @@
+zg 16.10.2017 17:28:26 +0300 - build 5066
+
+1. 0002760: Отдельные макрообласти для GRABBER, HMENU, DESKTOP.
+
+2. 0002761: Отдать в АПИ константы WTYPE_GRABBER, WTYPE_HMENU, WTYPE_DESKTOP, WTYPE_FINDFOLDER.
+
 zg 15.10.2017 16:22:28 +0300 - build 5065
 
 1. уточнение 5050.1: macro Align Block Special is broken.

diff --git a/far/desktop.cpp b/far/desktop.cpp
@@ -46,6 +46,7 @@ desktop::desktop(private_tag)
 {
 	SetCanLoseFocus(true);
 	desktop::SetPosition(0, 0, ScrX, ScrY);
+	SetMacroMode(MACROAREA_DESKTOP);
 }
 
 desktop_ptr desktop::create()

diff --git a/far/grabber.cpp b/far/grabber.cpp
@@ -67,6 +67,7 @@ grabber_ptr Grabber::create()
 
 void Grabber::init()
 {
+	SetMacroMode(MACROAREA_GRABBER);
 	SaveScr = std::make_unique<SaveScreen>();
 	bool Visible=false;
 	DWORD Size=0;

diff --git a/far/plugapi.cpp b/far/plugapi.cpp
@@ -415,9 +415,9 @@ intptr_t WINAPI apiAdvControl(const GUID* PluginId, ADVANCED_CONTROL_COMMANDS Co
 				case WTYPE_VMENU:
 				case WTYPE_HELP:
 				case WTYPE_COMBOBOX:
+				case WTYPE_GRABBER:
+				case WTYPE_HMENU:
 				//case WTYPE_FINDFOLDER:
-				//case WTYPE_GRABBER:
-				//case WTYPE_HMENU:
 					info->Type=type;
 					return TRUE;
 				default:

diff --git a/far/plugin.hpp b/far/plugin.hpp
@@ -1197,7 +1197,7 @@ enum FARMACROSENDSTRINGCOMMAND
 
 enum FARMACROAREA
 {
-	MACROAREA_OTHER                      =   0,   // Mode of copying text from the screen; vertical menus
+	MACROAREA_OTHER                      =   0,   // Reserved
 	MACROAREA_SHELL                      =   1,   // File panels
 	MACROAREA_VIEWER                     =   2,   // Internal viewer program
 	MACROAREA_EDITOR                     =   3,   // Editor
@@ -1214,6 +1214,8 @@ enum FARMACROAREA
 	MACROAREA_USERMENU                   =  14,   // User menu
 	MACROAREA_SHELLAUTOCOMPLETION        =  15,   // Autocompletion list in command line
 	MACROAREA_DIALOGAUTOCOMPLETION       =  16,   // Autocompletion list in dialogs
+	MACROAREA_GRABBER                    =  17,   // Mode of copying text from the screen
+	MACROAREA_DESKTOP                    =  18,   // Desktop
 #ifdef FAR_USE_INTERNALS
 	MACROAREA_LAST,
 	MACROAREA_INVALID                    =  -1,
@@ -1402,10 +1404,10 @@ enum WINDOWINFO_TYPE
 	WTYPE_VMENU                     = 5,
 	WTYPE_HELP                      = 6,
 	WTYPE_COMBOBOX                  = 7,
+	WTYPE_GRABBER                   = 8,
+	WTYPE_HMENU                     = 9,
 #ifdef FAR_USE_INTERNALS
 	WTYPE_FINDFOLDER,
-	WTYPE_GRABBER,
-	WTYPE_HMENU,
 #endif // END FAR_USE_INTERNALS
 };
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,5065)m4_dnl
+m4_define(BUILD,5066)m4_dnl