SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor input_sender to have main logic be cross platform

Browse Source 
Previously logic was duplicated for Linux/Windows.
Additionally, Linux was
```cpp
if ( isModifier( token ) )
{
    sendKeyPress( token, KeyStatus::Down, display );
    if ( noKeyUp )
    {
        heldInputs.push_back( token );
    }
    continue;
}
```
while Windows was
```cpp
if ( isModifier( token ) )
{
    inputs.push_back( createInputStruct(
                convertToVirtualKeycode( token ), KeyStatus::Down ) );
    if ( !noKeyUp )
    {
        heldInputs.push_back( token );
    }
    continue;
}
```
(notice difference in noKeyUp if statement which was a bug on Linux.
Windows was the correct version and it has been kept.
This commit is contained in:
Vasily
2020-05-17 22:36:35 +02:00
committed by username223
parent d1fd7b9a60
commit 9412c31e42
3 changed files with 99 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/keyboard_input/input_sender.h
+66 -1
View File
@@ -8,7 +8,72 @@ enum class KeyStatus
Down,
};
void sendTokensAsInput( const std::vector<Token> tokens );
void initOsSystems();
void shutdownOsSystems();
void sendKeyPress( const Token token, const KeyStatus status );
inline void sendTokensAsInput( const std::vector<Token> tokens )
{
initOsSystems();
std::vector<Token> heldInputs = {};
bool noKeyUp = false;
for ( const auto& token : tokens )
{
if ( token == Token::TOKEN_NO_KEYUP_NEXT )
{
noKeyUp = true;
continue;
}
if ( isModifier( token ) )
{
sendKeyPress( token, KeyStatus::Down );
if ( !noKeyUp )
{
heldInputs.push_back( token );
}
continue;
}
if ( token == Token::TOKEN_NEW_SEQUENCE )
{
for ( const auto& h : heldInputs )
{
sendKeyPress( h, KeyStatus::Up );
}
heldInputs.clear();
continue;
}
if ( isLiteral( token ) )
{
sendKeyPress( token, KeyStatus::Down );
if ( !noKeyUp )
{
sendKeyPress( token, KeyStatus::Up );
}
continue;
}
if ( token != Token::TOKEN_NO_KEYUP_NEXT )
{
noKeyUp = false;
continue;
}
}
if ( !heldInputs.empty() )
{
for ( const auto& h : heldInputs )
{
sendKeyPress( h, KeyStatus::Up );
}
}
shutdownOsSystems();
}
inline void sendStringAsInput( const std::string input )
{
src/keyboard_input/input_sender_X11.cpp
+20 -69
View File
@@ -163,9 +163,24 @@ unsigned int tokenToKeySym( const Token token )
}
}
void sendKeyPress( const Token token,
const KeyStatus status,
Display* const display )
Display* getDisplay()
{
static Display* display = XOpenDisplay( nullptr );
return display;
}
void initOsSystems()
{
XTestGrabControl( getDisplay(), True );
}
void shutdownOsSystems()
{
XSync( getDisplay(), False );
XTestGrabControl( getDisplay(), False );
}
void sendKeyPress( const Token token, const KeyStatus status )
{
bool keyDown = false;
@@ -174,72 +189,8 @@ void sendKeyPress( const Token token,
keyDown = true;
}
XTestFakeKeyEvent( display,
XKeysymToKeycode( display, tokenToKeySym( token ) ),
XTestFakeKeyEvent( getDisplay(),
XKeysymToKeycode( getDisplay(), tokenToKeySym( token ) ),
keyDown,
0 );
}
void sendTokensAsInput( const std::vector<Token> tokens )
{
Display* const display = XOpenDisplay( nullptr );
XTestGrabControl( display, True );
std::vector<Token> heldInputs = {};
bool noKeyUp = false;
for ( const auto& token : tokens )
{
if ( token == Token::TOKEN_NO_KEYUP_NEXT )
{
noKeyUp = true;
continue;
}
if ( isModifier( token ) )
{
sendKeyPress( token, KeyStatus::Down, display );
if ( noKeyUp )
{
heldInputs.push_back( token );
}
continue;
}
if ( token == Token::TOKEN_NEW_SEQUENCE )
{
for ( const auto& h : heldInputs )
{
sendKeyPress( h, KeyStatus::Up, display );
}
heldInputs.clear();
continue;
}
if ( isLiteral( token ) )
{
sendKeyPress( token, KeyStatus::Down, display );
if ( noKeyUp )
{
sendKeyPress( token, KeyStatus::Up, display );
}
continue;
}
if ( token != Token::TOKEN_NO_KEYUP_NEXT )
{
noKeyUp = false;
continue;
}
}
if ( !heldInputs.empty() )
{
for ( const auto& h : heldInputs )
{
sendKeyPress( h, KeyStatus::Up, display );
}
}
XSync( display, False );
XTestGrabControl( display, False );
}
src/keyboard_input/input_sender_win.cpp
+13 -63
View File
@@ -93,6 +93,15 @@ WORD convertToVirtualKeycode( const Token token )
return 0;
}
}
void initOsSystems()
{
// Intentionally blank, no setup needed on Windows
}
void shutdownOsSystems()
{
// Intentionally blank, no shutdown needed on Windows
}
INPUT createInputStruct( const WORD virtualKeyCode,
const KeyStatus keyStatus ) noexcept
@@ -163,68 +172,9 @@ void sendKeyboardInputRaw( std::vector<INPUT> inputs )
}
}
void sendTokensAsInput( const std::vector<Token> tokens )
void sendKeyPress( const Token token, const KeyStatus status )
{
std::vector<INPUT> inputs = {};
std::vector<Token> heldInputs = {};
bool noKeyUp = false;
for ( const auto& token : tokens )
{
if ( token == Token::TOKEN_NO_KEYUP_NEXT )
{
noKeyUp = true;
continue;
}
if ( isModifier( token ) )
{
inputs.push_back( createInputStruct(
convertToVirtualKeycode( token ), KeyStatus::Down ) );
if ( !noKeyUp )
{
heldInputs.push_back( token );
}
continue;
}
if ( token == Token::TOKEN_NEW_SEQUENCE )
{
for ( const auto& h : heldInputs )
{
inputs.push_back( createInputStruct(
convertToVirtualKeycode( h ), KeyStatus::Up ) );
}
heldInputs.clear();
continue;
}
if ( isLiteral( token ) )
{
inputs.push_back( createInputStruct(
convertToVirtualKeycode( token ), KeyStatus::Down ) );
if ( !noKeyUp )
{
inputs.push_back( createInputStruct(
convertToVirtualKeycode( token ), KeyStatus::Up ) );
}
continue;
}
if ( token != Token::TOKEN_NO_KEYUP_NEXT )
{
noKeyUp = false;
continue;
}
}
if ( !heldInputs.empty() )
{
for ( const auto& h : heldInputs )
{
inputs.push_back( createInputStruct( convertToVirtualKeycode( h ),
KeyStatus::Up ) );
}
}
sendKeyboardInputRaw( inputs );
// send inputs
std::vector<INPUT> v
= { createInputStruct( convertToVirtualKeycode( token ), status ) };
sendKeyboardInputRaw( v );
}