Skip to content

Commit a7b2649

Browse files
committed
Merge branch 'release/0.10'
2 parents 82d9cfa + b4ae0b5 commit a7b2649

File tree

97 files changed

+7181
-1428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+7181
-1428
lines changed

.clang-format

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
BasedOnStyle: LLVM
3+
IndentWidth: 2
4+
TabWidth: 2
5+
UseTab: Never
6+
MaxEmptyLinesToKeep: 2
7+
ColumnLimit: 100
8+
9+
Language: Cpp
10+
#LambdaBodyIndentation: OuterScope
11+
Cpp11BracedListStyle: true
12+
PointerAlignment: Left
13+
ConstructorInitializerIndentWidth: '2'
14+
ContinuationIndentWidth: 2
15+
SortIncludes: 'true'
16+
EmptyLineBeforeAccessModifier: Leave
17+
BinPackArguments: 'true'
18+
BinPackParameters: 'true'
19+
AlignAfterOpenBracket: Align
20+
AlignEscapedNewlines: Left
21+
KeepEmptyLinesAtTheStartOfBlocks: true
22+
AllowShortIfStatementsOnASingleLine: WithoutElse
23+
AllowShortLambdasOnASingleLine: All
24+
AllowShortLoopsOnASingleLine: true
25+
AllowShortCaseLabelsOnASingleLine: true
26+
AlwaysBreakTemplateDeclarations: 'Yes'
27+
AllowShortFunctionsOnASingleLine: Inline
28+
AllowShortBlocksOnASingleLine: Always
29+
AllowShortEnumsOnASingleLine: true
30+
BreakConstructorInitializers: BeforeComma
31+
BreakBeforeConceptDeclarations: 'true'
32+
Standard: c++14
33+
EmptyLineBeforeAccessModifier: Always
34+
BreakBeforeBinaryOperators: NonAssignment
35+
AlignConsecutiveAssignments: true
36+
NamespaceIndentation: Inner
37+
BreakBeforeBraces: Custom
38+
BraceWrapping:
39+
AfterClass: true
40+
AfterControlStatement: MultiLine
41+
SplitEmptyFunction: false
42+
SplitEmptyRecord: false
43+
BeforeElse: true
44+
BeforeLambdaBody: false
45+
46+
47+
...

.clang-tidy

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
Checks: >
3+
*,-fuchsia*,-android-*,
4+
-modernize-pass-by-value,-modernize-use-trailing-return-type,
5+
-llvmlibc-restrict-system-libc-headers,-llvmlibc-*,
6+
-altera-unroll-loops,-altera-struct-pack-align,
7+
-cppcoreguidelines-owning-memory,
8+
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,
9+
-llvm-qualified-auto,-readability-qualified-auto,
10+
-cppcoreguidelines-avoid-magic-numbers,
11+
-google-build-using-namespace,
12+
-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,
13+
-cppcoreguidelines-pro-type-static-cast-downcast,
14+
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
15+
-readability-implicit-bool-conversion, - readability-container-size-empty,
16+
-hicpp-signed-bitwise, -cppcoreguidelines-macro-usage,
17+
-cppcoreguidelines-avoid-c-arrays,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,
18+
-google-default-arguments,-google-readability-todo,
19+
-hicpp-uppercase-literal-suffix,-readability-uppercase-literal-suffix,
20+
-clang-analyzer-core.CallAndMessage, -readability-static-accessed-through-instance
21+
22+
WarningsAsErrors: false
23+
CheckOptions:
24+
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
25+
value: true
26+
- key: readability-magic-numbers.IgnorePowersOf2IntegerValues
27+
value: true
28+
- key: readability-magic-numbers.IgnoredIntegerValues
29+
value: '1;2;3;4;5;6;10;24;60;100;1000;'

.github/workflows/ci-build.yml

+24-11
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,28 @@ jobs:
1616
matrix:
1717
docker_tag:
1818
- archlinux
19-
- fedora-30
2019
- fedora-31
2120
- fedora-32
2221
- fedora-33
2322
- fedora-34
23+
- fedora-37
24+
- fedora-38
2425
- debian-stretch
2526
- debian-buster
2627
- debian-bullseye
28+
- debian-bookworm
2729
- ubuntu-18.04
2830
- ubuntu-20.04
2931
- ubuntu-20.10
3032
- ubuntu-21.04
33+
- ubuntu-22.04
34+
- ubuntu-23.04
3135
- opensuse-15.0
3236
- opensuse-15.1
3337
- opensuse-15.2
3438
- opensuse-15.3
39+
- opensuse-15.4
40+
- opensuse-15.5
3541
- centos-8
3642
os:
3743
- ubuntu-latest
@@ -54,7 +60,11 @@ jobs:
5460
5561
# ===================================================================================
5662
# ---------- Checkout and build inside docker container ----------
57-
- uses: actions/checkout@v1
63+
- uses: actions/checkout@v3
64+
with:
65+
# unfortunately, currently we need all the history for a valid auto generated version
66+
fetch-depth: 0
67+
5868
- run: |
5969
export BRANCH=${GITHUB_REF/refs\/heads\//}
6070
echo Detected branch: ${BRANCH}
@@ -112,22 +122,22 @@ jobs:
112122
# ---------- Upload artifacts to github ----------
113123
- name: Upload source-pkg artifact to github
114124
if: startsWith(matrix.docker_tag, 'archlinux')
115-
uses: actions/upload-artifact@v2
125+
uses: actions/upload-artifact@v3
116126
with:
117127
name: source-package
118128
path: ${{ env.src_pkg_artifact }}
119129

120130
- name: Upload version-info to github
121131
if: startsWith(matrix.docker_tag, 'archlinux')
122-
uses: actions/upload-artifact@v2
132+
uses: actions/upload-artifact@v3
123133
with:
124134
name: version-info
125135
path: |
126136
./version-string
127137
./version-branch
128138
129139
- name: Upload binary package artifact to github
130-
uses: actions/upload-artifact@v2
140+
uses: actions/upload-artifact@v3
131141
with:
132142
name: ${{ matrix.docker_tag }}-package
133143
path: ${{ env.dist_pkg_artifact }}
@@ -185,13 +195,16 @@ jobs:
185195
filename=$(basename -- "${{ env.dist_pkg_artifact }}")
186196
export PKG_TYPE="${filename##*.}"
187197
declare -A distromap=( ["debian-stretch"]="debian/stretch" ["debian-buster"]="debian/buster" \
188-
["debian-bullseye"]="debian/bullseye" ["ubuntu-18.04"]="ubuntu/bionic" \
198+
["debian-bullseye"]="debian/bullseye" ["debian-bookworm"]="debian/bookworm" \
199+
["ubuntu-18.04"]="ubuntu/bionic" \
189200
["ubuntu-20.04"]="ubuntu/focal" ["ubuntu-21.04"]="ubuntu/hirsute" \
201+
["ubuntu-22.04"]="ubuntu/jammy" ["ubuntu-23.04"]="ubuntu/lunar" \
190202
["opensuse-15.1"]="opensuse/15.1" ["opensuse-15.2"]="opensuse/15.2" \
191-
["opensuse-15.3"]="opensuse/15.3" ["centos-8"]="el/8" \
192-
["fedora-30"]="fedora/30" ["fedora-31"]="fedora/31" \
203+
["opensuse-15.3"]="opensuse/15.3" ["opensuse-15.4"]="opensuse/15.4" \
204+
["opensuse-15.5"]="opensuse/15.5" ["centos-8"]="el/8" \
205+
["fedora-31"]="fedora/31" \
193206
["fedora-32"]="fedora/32" ["fedora-33"]="fedora/33" \
194-
["fedora-34"]="fedora/34" )
207+
["fedora-34"]="fedora/34" ["fedora-37"]="fedora/37" ["fedora-38"]="fedora/38" )
195208
export DISTRO=${distromap[${{ matrix.docker_tag }}]}
196209
echo PKGTYPE=$PKG_TYPE
197210
echo DISTRO=$DISTRO
@@ -220,7 +233,7 @@ jobs:
220233

221234
steps:
222235
- name: Get version-info
223-
uses: actions/download-artifact@v2
236+
uses: actions/download-artifact@v3
224237
with:
225238
name: version-info
226239

@@ -233,7 +246,7 @@ jobs:
233246
DO_UPLOAD=$(( [ "master" = "$BRANCH" ] || [ "develop" = "$BRANCH" ] ) && echo true || echo false)
234247
echo "DO_UPLOAD=${DO_UPLOAD}" >> $GITHUB_ENV
235248
236-
- uses: actions/download-artifact@v2
249+
- uses: actions/download-artifact@v3
237250
if: env.DO_UPLOAD == 'true'
238251
with:
239252
path: artifacts

.github/workflows/codeql-analysis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ jobs:
2222
qt5-default libqt5x11extras5-dev
2323
2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2626
with:
2727
# We must fetch at least the immediate parents so that if this is
2828
# a pull request then we can checkout the head.
2929
fetch-depth: 2
3030

3131
# If this run was triggered by a pull request event, then checkout
3232
# the head of the pull request instead of the merge commit.
33-
- run: git checkout HEAD^2
34-
if: ${{ github.event_name == 'pull_request' }}
33+
# - run: git checkout HEAD^2
34+
# if: ${{ github.event_name == 'pull_request' }}
3535

3636
- name: Configure and build Qt moc cpps
3737
run: |
@@ -42,7 +42,7 @@ jobs:
4242
4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v1
45+
uses: github/codeql-action/init@v2
4646
with:
4747
queries: +security-and-quality
4848

@@ -52,4 +52,4 @@ jobs:
5252
make -j2
5353
5454
- name: Perform CodeQL Analysis
55-
uses: github/codeql-action/analyze@v1
55+
uses: github/codeql-action/analyze@v2

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ CMakeLists.txt.user*
22
.vscode
33
.idea
44
*.code-workspace
5-
build
5+
build-*
66
build/*
77
icons/icon-font/output/

55-projecteur.rules.in

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c53e", MODE="0660
1212
# Rule fot the Logitech Spotlight when connected via Bluetooth
1313
# Updated rule, thanks to Torsten Maehne (https://github.com/maehne)
1414
SUBSYSTEMS=="input", ENV{LIBINPUT_DEVICE_GROUP}="5/46d/b503*", ATTRS{name}=="SPOTLIGHT*", MODE="0660", TAG+="uaccess"
15+
# Additional rule for Bluetooth sub-devices (hidraw)
16+
SUBSYSTEMS=="hid", KERNELS=="0005:046D:B503.*", MODE="0660", TAG+="uaccess"
1517

1618
# Additional supported Bluetooth devices @EXTRA_BLUETOOTH_UDEV_RULES@
1719

18-
# Rules for uninput: Essential for creating a virtual input device that
19-
# Projecteur use for forwarding device events to the system after grabbing it
20+
# Rules for uinput: Essential for creating a virtual input device that
21+
# Projecteur uses to forward device events to the system after grabbing it
2022
KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"

0 commit comments

Comments
 (0)