Merge branch 'FarGroup:master' into master

FarGroup · Nov 15, 2023 · 7b20645 · 7b20645
2 parents 7c78f44 + 25dc22f
commit 7b20645
Show file tree

Hide file tree

Showing 44 changed files with 1,370 additions and 952 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-dotnet@v3
         with:
@@ -66,7 +66,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         if: matrix.build == 'msbuild_cl_x64_debug'
@@ -124,7 +124,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         if: matrix.build == 'nmake_cl_x64_debug'
@@ -179,18 +179,22 @@ jobs:
                  mingw_gcc_x64_debug,
                  mingw_gcc_x64_release,
                  mingw_clang_x64_debug,
-                 mingw_clang_x64_release
+                 mingw_clang_x64_release,
+                 mingw_llvm_x64_debug,
+                 mingw_llvm_x64_release
                ]
 
         include:
           - { build: mingw_gcc_x64_debug,     compiler: mingw_gcc,   arch: amd64, build_config: Debug }
           - { build: mingw_gcc_x64_release,   compiler: mingw_gcc,   arch: amd64, build_config: Release }
-          - { build: mingw_clang_x64_Debug,   compiler: mingw_clang, arch: amd64, build_config: Debug }
-          - { build: mingw_clang_x64_Release, compiler: mingw_clang, arch: amd64, build_config: Release }
+          - { build: mingw_clang_x64_debug,   compiler: mingw_clang, arch: amd64, build_config: Debug }
+          - { build: mingw_clang_x64_release, compiler: mingw_clang, arch: amd64, build_config: Release }
+          - { build: mingw_llvm_x64_debug,    compiler: mingw_llvm,  arch: amd64, build_config: Debug }
+          - { build: mingw_llvm_x64_release,  compiler: mingw_llvm,  arch: amd64, build_config: Release }
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         if: matrix.build == 'mingw_gcc_x64_debug'
@@ -250,6 +254,34 @@ jobs:
           clang --version
           make -j4 CLANG=1 -f makefile_all_gcc
 
+      - name: Install llvm x64
+        id: install_llvm_x64
+        if: matrix.compiler  == 'mingw_llvm'
+        uses: robinraju/[email protected]
+        with:
+          repository: "mstorsjo/llvm-mingw"
+          latest: true
+          fileName: "llvm-mingw-*-msvcrt-x86_64.zip"
+          extract: true
+
+      - name: Build Far (llvm)
+        if: matrix.compiler  == 'mingw_llvm'
+        working-directory: far
+        shell: cmd
+        run: |
+          set path=${{github.workspace}}\llvm-mingw-${{steps.install_llvm_x64.outputs.tag_name}}-msvcrt-x86_64\bin;%path%
+          clang --version
+          make -j4 CLANG=1 -f makefile_gcc
+
+      - name: Build plugins (llvm)
+        if: matrix.compiler  == 'mingw_llvm'
+        working-directory: plugins
+        shell: cmd
+        run: |
+          set path=${{github.workspace}}\llvm-mingw-${{steps.install_llvm_x64.outputs.tag_name}}-msvcrt-x86_64\bin;%path%
+          clang --version
+          make -j4 CLANG=1 -f makefile_all_gcc
+
       - name: Perform CodeQL Analysis
         if: matrix.build == 'mingw_gcc_x64_debug'
         uses: github/codeql-action/analyze@v2
diff --git a/far/api_test.c b/far/api_test.c
@@ -33,3 +33,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "Include/plugin.hpp"
 #include "Include/farcolor.hpp"
+
+#ifdef __cplusplus
+static_assert(FCF_INDEXMASK == (FCF_FG_INDEX | FCF_BG_INDEX), "");
+static_assert(FCF_FG_4BIT == FCF_FG_INDEX, "");
+static_assert(FCF_BG_4BIT == FCF_BG_INDEX, "");
+static_assert(FCF_4BITMASK == FCF_INDEXMASK, "");
+#endif
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,49 @@
+--------------------------------------------------------------------------------
+shmuel 2023-11-14 23:04:38+02:00 - build 6212
+
+1. Fix Macro Settings dialog.
+
+--------------------------------------------------------------------------------
+shmuel 2023-11-13 20:19:31+02:00 - build 6211
+
+1. Refactoring.
+
+--------------------------------------------------------------------------------
+drkns 2023-11-11 23:43:42+00:00 - build 6210
+
+1. M#4019: restore elevation requests for network paths
+
+2. gh-747: Build 6209 crashes on start with the profile from build 5629.
+
+3. Refactoring.
+
+--------------------------------------------------------------------------------
+drkns 2023-11-07 01:48:43+00:00 - build 6209
+
+1. Correction of 6204.
+
+--------------------------------------------------------------------------------
+drkns 2023-11-06 18:35:45+00:00 - build 6208
+
+1. Refactoring.
+
+2. Clang:
+   - Fix build
+   - Fix warnings
+   - Remove outdated workarounds
+   - Bump version
+
+3. Clarification of "black on black - default color" logic in Files highlighting:
+   black on black is now considered "default" (or "transparent") only when both
+   foreground and background are fully opaque.
+   If you noticed a sudden black color somewhere where it shouldn't be - make sure
+   that both foreground and background are either fully opaque or fully transparent,
+   either via the UI or:
+   1. export the config
+   2. search for:   background="00000000" foreground="FF000000"
+      replace with: background="00000000" foreground="00000000"
+   3. save and import.
+
 --------------------------------------------------------------------------------
 yjh 2023-11-02 09:24:30+03:00 - build 6207