Skip to content

Commit 48a7cf4

Browse files
authored
5.8.3 (#658)
* add delay if interface not found * adjust initialization behavior * pushed for debugging reasons for concerned parties * comment out simple recenter * remove old style motion, some minor optimizations * optimize default case check * optimized default condition * change manifest install behavior to trigger on desktop mode as well * add desktop mode binding launch * add tracker overlay option to utils * commit to check status * attempt to fix native LH issues with chaperone when exiting * add desktop mode toggle and some cleanup * remove adjust chaperone * remove clang format from ci, increment version, cleanup * update circle ci * fix conversion warning * add F13-19 to keyboard parser * add additional logging around failure to initialize * add unsaved changes * update version 5.8.1 * fix some collisions in enum declaration * add controller powers on steamvr, and no HMD to steamvr tab, increment version * slightly alter drag movement, fix qml issue * code cleanup * fix logspam/attempt to delete non existant overlays * increment version 5.8.3
1 parent 54d22a4 commit 48a7cf4

29 files changed

Lines changed: 529 additions & 493 deletions

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ init:
3434

3535
build_script:
3636
- python ./build_scripts/append_to_version_file.py %APPVEYOR_REPO_COMMIT:~0,8%
37-
- python ./build_scripts/run-clang-format.py ./src -r --clang-format-executable "C:\Program Files\LLVM\bin\clang-format.exe" --color always
37+
# - python ./build_scripts/run-clang-format.py ./src -r --clang-format-executable "C:\Program Files\LLVM\bin\clang-format.exe" --color always
3838
- call "build_windows.cmd"
3939

4040
artifacts:

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ jobs:
2929
sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
3030
sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
3131
sudo apt-get update -qq
32-
- run:
33-
name: Install LLVM-8 binaries
34-
# clang is required due to a check by Qmake.
35-
# clang-tidy-8 has new errors compared to clang-tidy-7, so we haven't upgraded.
36-
command: |
37-
sudo apt-get install clang-format-8 -y
38-
sudo apt-get install clang-tidy-7 -y
39-
sudo apt-get install clang-8 -y
40-
sudo apt-get install clang -y
41-
- run:
42-
name: Run clang-format
43-
command: python ./build_scripts/run-clang-format.py ./src -r --color always --clang-format-executable clang-format-8
32+
#- run:
33+
# name: Install LLVM-8 binaries
34+
# # clang is required due to a check by Qmake.
35+
# # clang-tidy-8 has new errors compared to clang-tidy-7, so we haven't upgraded.
36+
# command: |
37+
# sudo apt-get install clang-format-8 -y
38+
# sudo apt-get install clang-tidy-7 -y
39+
# sudo apt-get install clang-8 -y
40+
# sudo apt-get install clang -y
41+
#- run:
42+
# name: Run clang-format
43+
# command: python ./build_scripts/run-clang-format.py ./src -r --color always --clang-format-executable clang-format-8
4444
- run:
4545
name: Install g++
4646
command: |

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ before_install:
3030
- sudo apt update -qq
3131
- sudo apt install clang-format-8
3232
- clang-format-8 --version
33-
- python ./build_scripts/run-clang-format.py ./src -r --color always --clang-format-executable clang-format-8
33+
# - python ./build_scripts/run-clang-format.py ./src -r --color always --clang-format-executable clang-format-8
3434
- sed -i 's/QMAKE_CXXFLAGS += -flto//g' ./build_scripts/qt/compilers/clang-gcc-common-switches.pri # CI version of clang can't handle LTO
3535
- sed -i 's/QMAKE_LFLAGS += -flto -fuse-ld=gold//g' ./build_scripts/qt/compilers/clang-gcc-common-switches.pri # CI version of clang can't handle LTO
3636

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.7.4-release
1+
5.8.3-release

build_scripts/qt/resources.pri

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ DISTFILES += \
4545
src/res/qml/utilities_page/media_keys/* \
4646
src/res/qml/utilities_page/keyboard_utils/* \
4747
src/res/qml/utilities_page/alarm_clock/* \
48+
src/res/qml/utilities_page/misc/* \
4849
src/res/qml/audio_page/dialog_boxes/* \
4950
src/res/qml/audio_page/device_selector/* \
5051
src/res/qml/audio_page/proximity/* \

src/keyboard_input/input_parser.cpp

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,20 @@ std::optional<Token> getFunctionNumberExtended( const char& character ) noexcept
6565
return Token::KEY_F11;
6666
case '2':
6767
return Token::KEY_F12;
68-
// Theoretically we could extende out to f19, but as F12 is the only
69-
// function key on Standard Keyboard.
68+
case '3':
69+
return Token::KEY_F13;
70+
case '4':
71+
return Token::KEY_F14;
72+
case '5':
73+
return Token::KEY_F15;
74+
case '6':
75+
return Token::KEY_F16;
76+
case '7':
77+
return Token::KEY_F17;
78+
case '8':
79+
return Token::KEY_F18;
80+
case '9':
81+
return Token::KEY_F19;
7082
default:
7183
LOG( INFO ) << "Unknown function key number: " << character;
7284
return std::nullopt;
@@ -477,6 +489,20 @@ bool isLiteral( const Token token ) noexcept
477489
return true;
478490
case Token::KEY_F12:
479491
return true;
492+
case Token::KEY_F13:
493+
return true;
494+
case Token::KEY_F14:
495+
return true;
496+
case Token::KEY_F15:
497+
return true;
498+
case Token::KEY_F16:
499+
return true;
500+
case Token::KEY_F17:
501+
return true;
502+
case Token::KEY_F18:
503+
return true;
504+
case Token::KEY_F19:
505+
return true;
480506

481507
case Token::KEY_BACKSPACE:
482508
return true;

src/keyboard_input/input_parser.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@ enum class Token
2020
KEY_F10,
2121
KEY_F11,
2222
KEY_F12,
23+
KEY_F13,
24+
KEY_F14,
25+
KEY_F15,
26+
KEY_F16,
27+
KEY_F17,
28+
KEY_F18,
29+
KEY_F19,
2330

24-
KEY_BACKSPACE,
31+
KEY_BACKSPACE = 150,
2532
KEY_SPACE,
2633
KEY_TAB,
2734
KEY_ESC,

src/keyboard_input/input_sender_X11.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,20 @@ unsigned int tokenToKeySym( const Token token )
105105
return XK_F11;
106106
case Token::KEY_F12:
107107
return XK_F12;
108+
case Token::KEY_F13:
109+
return XK_F13;
110+
case Token::KEY_F14:
111+
return XK_F14;
112+
case Token::KEY_F15:
113+
return XK_F15;
114+
case Token::KEY_F16:
115+
return XK_F16;
116+
case Token::KEY_F17:
117+
return XK_F17;
118+
case Token::KEY_F18:
119+
return XK_F18;
120+
case Token::KEY_F19:
121+
return XK_F19;
108122

109123
case Token::KEY_BACKSPACE:
110124
return XK_BackSpace;

src/keyboard_input/input_sender_win.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@ WORD convertToVirtualKeycode( const Token token )
3636
return VK_F11;
3737
case Token::KEY_F12:
3838
return VK_F12;
39+
case Token::KEY_F13:
40+
return VK_F13;
41+
case Token::KEY_F14:
42+
return VK_F14;
43+
case Token::KEY_F15:
44+
return VK_F15;
45+
case Token::KEY_F16:
46+
return VK_F16;
47+
case Token::KEY_F17:
48+
return VK_F17;
49+
case Token::KEY_F18:
50+
return VK_F18;
51+
case Token::KEY_F19:
52+
return VK_F19;
3953

4054
case Token::KEY_BACKSPACE:
4155
return VK_BACK;

src/main.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#ifdef _WIN64
55
# include <windows.h>
66
extern "C" __declspec( dllexport ) DWORD NvOptimusEnablement = 0x00000001;
7-
extern "C" __declspec( dllexport ) DWORD
8-
AmdPowerXpressRequestHighPerformance = 0x00000001;
7+
extern "C" __declspec( dllexport ) DWORD AmdPowerXpressRequestHighPerformance
8+
= 0x00000001;
99
#endif
1010

1111
INITIALIZE_EASYLOGGINGPP
@@ -81,7 +81,7 @@ int main( int argc, char* argv[] )
8181
application_strings::applicationKey );
8282

8383
// Attempts to install the application manifest on all "regular" starts.
84-
if ( !commandLineArgs.desktopMode && !commandLineArgs.forceNoManifest )
84+
if ( !commandLineArgs.forceNoManifest )
8585
{
8686
try
8787
{
@@ -103,7 +103,9 @@ int main( int argc, char* argv[] )
103103
}
104104
}
105105

106-
if ( commandLineArgs.desktopMode )
106+
if ( commandLineArgs.desktopMode
107+
|| settings::getSetting(
108+
settings::BoolSetting::APPLICATION_desktopModeToggle ) )
107109
{
108110
auto m_pWindow = new QQuickWindow();
109111
qobject_cast<QQuickItem*>( quickObj )

0 commit comments

Comments
 (0)