Continue gh-957

alabuzhev · alabuzhev · commit 542d4ec95dad · 2025-05-27T17:18:57.000+01:00
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2025-05-27 17:18:29+01:00 - build 6484
+
+1. Continue gh-957.
+
 --------------------------------------------------------------------------------
 drkns 2025-05-26 22:19:53+01:00 - build 6483
 
diff --git a/far/plugapi.cpp b/far/plugapi.cpp
@@ -1280,11 +1280,15 @@ intptr_t WINAPI apiPanelControl(HANDLE hPlugin,FILE_CONTROL_COMMANDS Command,int
 		if (Command == FCTL_GETUSERSCREEN)
 		{
 			if (!UserScreenInvocations++)
+			{
 				Global->WindowManager->Desktop()->ConsoleSession().activate({}, !Param1);
+				console.start_prompt();
+				console.start_command();
+				console.start_output();
+			}
+			else
+				Global->WindowManager->Desktop()->ConsoleSession().snap(!Param1);
 
-			console.start_prompt();
-			console.start_command();
-			console.start_output();
 			return TRUE;
 		}
 
@@ -1297,12 +1301,13 @@ intptr_t WINAPI apiPanelControl(HANDLE hPlugin,FILE_CONTROL_COMMANDS Command,int
 				return TRUE;
 			}
 
-			console.command_finished();
-
 			if (!--UserScreenInvocations)
 			{
 				Global->WindowManager->Desktop()->ConsoleSession().deactivate(!Param1);
+				console.command_finished();
 			}
+			else
+				Global->WindowManager->Desktop()->ConsoleSession().snap(!Param1);
 
 			return TRUE;
 		}
diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6483
+6484
diff --git a/far/vmenu.cpp b/far/vmenu.cpp
@@ -558,7 +558,7 @@ namespace
 		const auto Intersection{ intersect(segment{ 0, segment::length_tag{ static_cast<segment::domain_t>(ItemName.size()) } }, CellSegment) };
 		if (Intersection.empty()) return {};
 		return ItemName.substr(Intersection.start(), Intersection.length());
-	};
+	}
 
 	std::pair<int, int> item_hpos_limits(const int ItemLength, const int TextAreaWidth, const item_hscroll_policy Policy) noexcept
 	{

Original file line number	Diff line number	Diff line change
`@@ -1280,11 +1280,15 @@ intptr_t WINAPI apiPanelControl(HANDLE hPlugin,FILE_CONTROL_COMMANDS Command,int`
`1280`	`1280`	`if (Command == FCTL_GETUSERSCREEN)`
`1281`	`1281`	`{`
`1282`	`1282`	`if (!UserScreenInvocations++)`
	`1283`	`+ {`
`1283`	`1284`	`Global->WindowManager->Desktop()->ConsoleSession().activate({}, !Param1);`
	`1285`	`+ console.start_prompt();`
	`1286`	`+ console.start_command();`
	`1287`	`+ console.start_output();`
	`1288`	`+ }`
	`1289`	`+ else`
	`1290`	`+ Global->WindowManager->Desktop()->ConsoleSession().snap(!Param1);`
`1284`	`1291`
`1285`		`- console.start_prompt();`
`1286`		`- console.start_command();`
`1287`		`- console.start_output();`
`1288`	`1292`	`return TRUE;`
`1289`	`1293`	`}`
`1290`	`1294`
`@@ -1297,12 +1301,13 @@ intptr_t WINAPI apiPanelControl(HANDLE hPlugin,FILE_CONTROL_COMMANDS Command,int`
`1297`	`1301`	`return TRUE;`
`1298`	`1302`	`}`
`1299`	`1303`
`1300`		`- console.command_finished();`
`1301`		`-`
`1302`	`1304`	`if (!--UserScreenInvocations)`
`1303`	`1305`	`{`
`1304`	`1306`	`Global->WindowManager->Desktop()->ConsoleSession().deactivate(!Param1);`
	`1307`	`+ console.command_finished();`
`1305`	`1308`	`}`
	`1309`	`+ else`
	`1310`	`+ Global->WindowManager->Desktop()->ConsoleSession().snap(!Param1);`
`1306`	`1311`
`1307`	`1312`	`return TRUE;`
`1308`	`1313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ namespace`
`558`	`558`	`const auto Intersection{ intersect(segment{ 0, segment::length_tag{ static_cast<segment::domain_t>(ItemName.size()) } }, CellSegment) };`
`559`	`559`	`if (Intersection.empty()) return {};`
`560`	`560`	`return ItemName.substr(Intersection.start(), Intersection.length());`
`561`		`- };`
	`561`	`+ }`
`562`	`562`
`563`	`563`	`std::pair<int, int> item_hpos_limits(const int ItemLength, const int TextAreaWidth, const item_hscroll_policy Policy) noexcept`
`564`	`564`	`{`