Restore imgview branch

Author: unxed

.cirrus.yml

@@ -1,8 +1,8 @@
 freebsd_test_task:
     freebsd_instance:
-        image_family: freebsd-14-0
+        image_family: freebsd-13-2
     name: cirrus/FreeBSD
-    install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 pcre uchardet xerces-c3
+    install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba413 pcre uchardet xerces-c3
     script: mkdir build && cd build && cmake .. && make -j $(getconf _NPROCESSORS_ONLN) && ./install/far2l --help
 
 macos_test_task:

.clang-format

@@ -4,22 +4,14 @@ IndentWidth:  4
 TabWidth:     4
 Language:     Cpp
 Standard:     Latest
-SortIncludes: Never
+SortIncludes: false
 
 AccessModifierOffset:              -4
 AlignAfterOpenBracket:             DontAlign
-AlignConsecutiveAssignments:
-  Enabled: false
-AlignConsecutiveDeclarations:
-  Enabled: false
-AlignConsecutiveBitFields:
-  Enabled: true
-  AcrossEmptyLines: true
-  AcrossComments: true
-AlignConsecutiveMacros:
-  Enabled: true
-  AcrossEmptyLines: true
-  AcrossComments: true
+AlignConsecutiveAssignments:         false
+AlignConsecutiveDeclarations:      false
+AlignConsecutiveBitFields:         true
+AlignConsecutiveMacros:            true
 AllowAllArgumentsOnNextLine:       false
 AllowShortFunctionsOnASingleLine:  Inline
 AllowShortLambdasOnASingleLine:    Empty
@@ -33,7 +25,7 @@ IndentCaseLabels:                  true
 BreakBeforeBraces:       Custom
 BraceWrapping:
   AfterClass:            true
-  AfterControlStatement: Never
+  AfterControlStatement: false
   AfterEnum:             true
   AfterFunction:         true
   AfterNamespace:        true

.github/workflows/artifacts.yml

@@ -1,9 +1,6 @@
 name: Artifacts
 
-on:
-  push:
-    branches:
-        - master
+on: [push]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -22,40 +19,45 @@ jobs:
             options: "-DPYTHON=yes"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
 
     - name: Dependencies
       run: sudo apt-get update ; sudo apt-get -y install $(cat dependencies${{ matrix.dependencies }}.txt)
 
     - name: Create Build Environment
-      # Create a separate build directory as working directory for all subsequent commands
-      run: mkdir -p _build
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
       # access regardless of the host operating system
       shell: bash
-      # -S and -B options specify source and build directories
-      run: cmake -S . -B _build -DCMAKE_BUILD_TYPE=$BUILD_TYPE ${{ matrix.options }}
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE ${{ matrix.options }}
 
     - name: Build
+      working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: |
-        cmake --build _build --config $BUILD_TYPE
+      run: cmake --build . --config $BUILD_TYPE
 
     - name: File Tree
+      working-directory: ${{github.workspace}}/build
       shell: bash
-      run: tree _build
+      run: tree
 
     - name: Packing Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
         name: far2l-release${{ matrix.dependencies }}
-        path: _build/install
+        path: ${{github.workspace}}/build/install
 
     - name: Test
-      working-directory: _build
+      working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

CMakeLists.txt

@@ -45,21 +45,10 @@ endif()
 
 if(NOT "${GIT_TAG}" STREQUAL "v_${VERSION}")
     if(GIT_FOUND)
-        if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git)
-            execute_process(COMMAND "${GIT_EXECUTABLE}" show --no-patch --format=%ci HEAD
-                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-                OUTPUT_VARIABLE GIT_DATE
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-            string(SUBSTRING ${GIT_DATE} 0 10 GIT_DATE)
-            execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
-                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-                OUTPUT_VARIABLE GIT_HASH
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-        endif()
-    endif()
-    if(NOT "${GIT_DATE}" STREQUAL "")
-        message(STATUS "git date: ${GIT_DATE}")
-        set(VERSION_PATCH "${VERSION_PATCH}-${GIT_DATE}")
+        execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
+            WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+            OUTPUT_VARIABLE GIT_HASH
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
     endif()
     if(NOT "${GIT_HASH}" STREQUAL "")
         message(STATUS "git hash: ${GIT_HASH}")
@@ -95,10 +84,6 @@ endif()
 
 ##############################
 
-if (NOT DEFINED TESTING)
-    set(TESTING "NO")
-endif()
-
 if (NOT DEFINED USEWX)
     set(USEWX "YES")
 endif()
@@ -459,7 +444,7 @@ if (DEFINED VIRTUAL_PYTHON)
     add_subdirectory (python)
     # Copy this explicitly cuz generic copier command excludes 'far2l'
     install(DIRECTORY "${INSTALL_DIR}/Plugins/python/plug/far2l"
-        DESTINATION "lib/far2l/Plugins/python/plug/" USE_SOURCE_PERMISSIONS
+        DESTINATION "share/far2l/Plugins/python/plug/" USE_SOURCE_PERMISSIONS
         COMPONENT base FILES_MATCHING
         PATTERN "*")
 else()
@@ -473,7 +458,7 @@ else()
                 execute_process(COMMAND echo Python: preparing virtual environment)
                 " COMPONENT system)
             install(CODE "
-                execute_process(COMMAND ${Python3_EXECUTABLE} -m venv --system-site-packages ${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python)
+                execute_process(COMMAND ${PYTHON3} -m venv --system-site-packages ${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python)
                 " COMPONENT system)
             install(CODE "
                 execute_process(COMMAND echo Python: installing packages)
@@ -484,7 +469,7 @@ else()
 
             # Copy this explicitly cuz generic copier command excludes 'far2l'
             install(DIRECTORY "${INSTALL_DIR}/Plugins/python/plug/far2l"
-                DESTINATION "lib/far2l/Plugins/python/plug/" USE_SOURCE_PERMISSIONS
+                DESTINATION "share/far2l/Plugins/python/plug/" USE_SOURCE_PERMISSIONS
                 COMPONENT base FILES_MATCHING
                 PATTERN "*")
         else()
@@ -540,8 +525,7 @@ install(DIRECTORY "${INSTALL_DIR}/" DESTINATION "lib/far2l" USE_SOURCE_PERMISSIO
     PATTERN "far2l_gui.so"
     PATTERN "far2l_ttyx.broker"
     PATTERN "plug/*.far-plug-*"
-    PATTERN "plug/*.broker"
-)
+    PATTERN "plug/*.broker")
 
 install(DIRECTORY "${INSTALL_DIR}/" DESTINATION "share/far2l" USE_SOURCE_PERMISSIONS COMPONENT base FILES_MATCHING
     PATTERN "${EXECUTABLE_NAME}" EXCLUDE
@@ -550,8 +534,7 @@ install(DIRECTORY "${INSTALL_DIR}/" DESTINATION "share/far2l" USE_SOURCE_PERMISS
     PATTERN "*.far-plug-*" EXCLUDE
     PATTERN "*.broker" EXCLUDE
     PATTERN "python/plug/python" EXCLUDE
-    PATTERN "*"
-)
+    PATTERN "*")
 
 # setup some symlinks and remove deprecated stuff from previous installation
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../../bin/far2l ${PROJECT_BINARY_DIR}/far2l/far2l_askpass)

FARStdlib/include/all_far.h

@@ -180,7 +180,7 @@ struct FPPeriod
 /** @defgroup StdLib RTL extension\replacement
 	@{
 
-	Wrappers for stdlib functions and some useful extended stdlib functions.
+	Wrapers for stdlib functions and some usefull extended stdlib functions.
 */
 #if !defined(__FP_NOT_FUNCTIONS__)
 // string extension
@@ -266,7 +266,7 @@ extern LPCSTR _cdecl Message(LPCSTR patt, ...);
 extern LPCSTR WINAPI MessageV(LPCSTR patt, va_list a);
 
 // Utils
-extern LPCSTR WINAPI FCps(char *buff, double val);	// Create CPS value string (Always 3+1+3+1 length)
+extern LPCSTR WINAPI FCps(char *buff, double val);	// Create CPS value string (Allways 3+1+3+1 length)
 extern LPSTR WINAPI AddLastSlash(char *path, char Slash = '/');
 extern LPSTR WINAPI DelLastSlash(char *path, char Slash = '/');
 extern LPCSTR WINAPI FPath(LPCSTR nm, char Slash = '/');

FARStdlib/include/fstdlib.h

@@ -1,5 +1,5 @@
-#ifndef __FAR_PLUGINS_UTILITIES
-#define __FAR_PLUGINS_UTILITIES
+#ifndef __FAR_PLUGINS_UTILITES
+#define __FAR_PLUGINS_UTILITES
 
 /** @mainpage FAR Standard Library
 	@author Jouri Mamaev [email protected]
@@ -9,7 +9,7 @@
 	  C++ library for easy create plugins for file and archive manager FAR. <br>
 	  Contains set of classes and functions designed to decrease time for write all types of FAR plugins.
 
-	  Initially created by [email protected]
+	  Initialy created by [email protected]
 
 	@section Structure Document structure
 	  This documentation structure:
@@ -20,8 +20,8 @@
 	   - Variables    Global variables;
 
 	@section Add Additional helpers.
-	  Additional helpers and classes does not relative to FAR API directly but used by other wrappers or
-	  incapsulate useful functionality.
+	  Additional helpers andd classes does not relatie to FAR API directly but used by other wrapers or
+	  incapsulate usefull functionality.
 
 	  - FP_Screen - helper for save and restore FAR screen buffer. <br>
 					Class for save and restore whole screen buffer.
@@ -344,7 +344,7 @@ struct FP_Dialog
 	[fstd_ilist.cpp]
 
 	PluginPanelItem Reserved and can be used to store additional data.
-	This data will be correctly copied and deleted in FP_ItemList.
+	This data will be correctly copyed and deleted in FP_ItemList.
 	You MUST use _Alloc or strdup to allocate data space.
 	Data CAT NOT BE zero sized.
 */

FARStdlib/include/funi.h

@@ -58,12 +58,12 @@
 typedef char *FKeyBarTitle[12];
 typedef FKeyBarTitle *PFKeyBarTitle;
 
-// Hot key for operate with codes got from plugin `ProcessKey` and passed to FPanel `DoProcessKey`
+// Hot key for operate with codes getted from plugin `ProcessKey` and passed to FPanel `DoProcessKey`
 #define FHK_MAKE(sh, key) MK_DWORD(((WORD)sh), ((WORD)key))
 #define FHK_SHIFT(hkey)   ((unsigned int)LO_WORD((DWORD)hkey))
 #define FHK_KEY(hkey)     ((int)HI_WORD((DWORD)hkey))
 
-// Useful console chars
+// Usefull console chars
 /*
 #define FAR_SHADOW_CHAR                      '\xB0' //°
 #define FAR_FULL_CHAR                        '\xDB' //Û
@@ -146,7 +146,7 @@ extern int WINAPI FP_Color(int far_color_num);
 
 // --------------------------------------------------------------
 #if !defined(__FP_NOT_FUNCTIONS__)
-extern PluginStartupInfo *FP_Info;	///< Pointer to FAR plugin communication info structure.
+extern PluginStartupInfo *FP_Info;	///< Pointer to FAR plugin comunication info structure.
 extern FarStandardFunctions *FP_FSF;
 extern char *FP_PluginRootKey;
 extern BOOL FP_IsOldFar;
@@ -163,7 +163,7 @@ extern LPCSTR WINAPI FP_GetPluginName(void);
 
 /** @defgroup DefDialog Dialog description
 	@{
-	Useful tools for define and set arrays of FAR dialog items.
+	Usefull tools for define and set arrays of FAR dialog items.
 */
 
 #define FFDI_MASK 0xFFUL
@@ -180,7 +180,7 @@ extern int WINAPI FP_Message(unsigned int Flags, LPCSTR HelpTopic, LPCSTR *Items
 	@{
 
 	[fstd_Msg.cpp]
-	Wrappers for FAR language API.
+	Wrapers for FAR language API.
 */
 #define FMSG(v)   ((LPCSTR)(INT_PTR)(v))
 #define FISMSG(v) ((v) != NULL && (DWORD_PTR)(v) > FAR_MAX_LANGID)
@@ -205,11 +205,11 @@ inline LPCSTR FP_GetMsg(LPCSTR Msg)
 /**@}*/
 
 // --------------------------------------------------------------
-/** @defgroup FarRegXX Registry manipulations.
+/** @defgroup FarRegXX Regestry manipulations.
 	@{
 
 	[fstd_RegXX.cpp]
-	Wrappers for regestry Win API.
+	Wrapers for regestry Win API.
 */
 #if !defined(__FP_NOT_FUNCTIONS__)
 extern int WINAPI FP_GetRegKey(LPCSTR Key, LPCSTR ValueName, DWORD Default);
@@ -266,11 +266,11 @@ extern void WINAPI FP_PopKey(HANDLE PushedKey);
 	@{
 
 	[fstd_ClpS.cpp]
-	Wrappers for clipboard Win API.
+	Wrapers for clipboard Win API.
 */
 #if !defined(__FP_NOT_FUNCTIONS__)
 extern BOOL WINAPI FP_CopyToClipboard(LPVOID Data, SIZE_T DataSize);
-extern BOOL WINAPI FP_GetFromClipboard(LPVOID &Data, SIZE_T &DataSize);		// The callees should call `free()` to recvd data
+extern BOOL WINAPI FP_GetFromClipboard(LPVOID &Data, SIZE_T &DataSize);		// The calles should call `free()` to recvd data
 #endif
 /**@}*/
 

FARStdlib/src/fstd_FMsg.cpp

@@ -30,7 +30,7 @@ int WINAPI FP_Message(unsigned int Flags, LPCSTR HelpTopic, LPCSTR *Items, int I
 			width = Max(width, strlen(litems[rc]));
 		}
 
-	// Calc if message need to be redrawn with smaller dimensions
+	// Calc if message need to be redrawn with smaller dimentions
 	if (!CMsgWidth || (int)width < CMsgWidth || !CMsgHeight || ItemsNumber < CMsgHeight)
 
 		// Need restore bk

FARStdlib/src/fstd_FUtils.cpp

@@ -8,7 +8,7 @@ SaveConsoleTitle::SaveConsoleTitle(BOOL rest /*= TRUE*/)
 	Usage = rest;
 	NeedToRestore = rest;
 	GET_TIME(LastChange);
-	WINPORT(GetConsoleTitle)(NULL, SaveTitle, ARRAYSIZE(SaveTitle));
+	WINPORT(GetConsoleTitle)(SaveTitle, ARRAYSIZE(SaveTitle));
 	Log(("TITLE: Save"));
 }
 SaveConsoleTitle::~SaveConsoleTitle()
@@ -35,7 +35,7 @@ void SaveConsoleTitle::Text(LPCSTR buff)
 			buff = _buff;
 		}
 	*/
-	WINPORT(SetConsoleTitle)(NULL, MB2Wide(buff).c_str());
+	WINPORT(SetConsoleTitle)(MB2Wide(buff).c_str());
 }
 
 void SaveConsoleTitle::Restore(void) {}

FARStdlib/src/fstd_Msg.cpp

@@ -4,7 +4,7 @@
 
 /** @ingroup GetMsg
 	@fn LPCSTR FP_GetMsg( int MsgId )
-	@brief Retrieve text message by it number.
+	@brief Retrive text message by it number.
 
 	@param MsgId Index of message in LNG file.
 
@@ -14,7 +14,7 @@
 
 /** @ingroup GetMsg
 	@fn LPCSTR FP_GetMsg( LPCSTR Msg )
-	@brief Retrieve text message by it number.
+	@brief Retrive text message by it number.
 
 	@param Msg Index of message in LNG file. Index can be converted to LPCSTR using FMSG parameter.
 			   You can set this parameter to real local string pointer.
@@ -69,12 +69,12 @@ static LPCSTR WINAPI _FP_GetMsgSTR(LPCSTR String)
 }
 
 /** @var FP_GetMsgINT
-	@brief Callback function for get language message specified by WORD identifier.
+	@brief Callback function for get language message specified by WORD identifer.
 */
 FP_GetMsgINT_t FP_GetMsgINT = _FP_GetMsgINT;
 
 /** @var FP_GetMsgSTR
 	@ingroup GetMsg
-	@brief Callback function for get language message specified by LPCSTR identifier.
+	@brief Callback function for get language message specified by LPCSTR identifer.
 */
 FP_GetMsgSTR_t FP_GetMsgSTR = _FP_GetMsgSTR;