diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2024-05-22 11:05:51 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@posteo.nl> | 2024-05-22 11:05:51 +0200 |
| commit | ad59ffd4bc7bc77b260da6152a188f6b2ab59d05 (patch) | |
| tree | 169edbab006d8bbd86b2980ab98fb62e097067ff /indra/llwindow/llkeyboardsdl.cpp | |
| parent | 3dc5fa00753bb889280771a2cd17029aa1e42f24 (diff) | |
| parent | ec23d45e2e9a87147641fed6f8c3ef6083c2f878 (diff) | |
Merge remote-tracking branch 'mkd/pipewire-linux-volume-catcher' into pipewire-linux-volume-catcher
Diffstat (limited to 'indra/llwindow/llkeyboardsdl.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboardsdl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp index b29b832011..0fe0b5b771 100644 --- a/indra/llwindow/llkeyboardsdl.cpp +++ b/indra/llwindow/llkeyboardsdl.cpp @@ -70,7 +70,7 @@ LLKeyboardSDL::LLKeyboardSDL() //mTranslateKeyMap[SDLK_KP3] = KEY_PAGE_DOWN; //mTranslateKeyMap[SDLK_KP0] = KEY_INSERT; - mTranslateKeyMap[SDLK_SPACE] = ' '; // <FS:ND/> Those are handled by SDL2 via text input, do not map them + mTranslateKeyMap[SDLK_SPACE] = ' '; // <FS:ND/> Those are handled by SDL2 via text input, do not map them mTranslateKeyMap[SDLK_RETURN] = KEY_RETURN; mTranslateKeyMap[SDLK_LEFT] = KEY_LEFT; mTranslateKeyMap[SDLK_RIGHT] = KEY_RIGHT; @@ -229,8 +229,8 @@ static U32 adjustNativekeyFromUnhandledMask(const U32 key, const U32 mask) BOOL LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask) { U32 adjusted_nativekey; - KEY translated_key = 0; - U32 translated_mask = MASK_NONE; + KEY translated_key = 0; + U32 translated_mask = MASK_NONE; BOOL handled = FALSE; adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask); @@ -249,8 +249,8 @@ BOOL LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask) BOOL LLKeyboardSDL::handleKeyUp(const U32 key, const U32 mask) { U32 adjusted_nativekey; - KEY translated_key = 0; - U32 translated_mask = MASK_NONE; + KEY translated_key = 0; + U32 translated_mask = MASK_NONE; BOOL handled = FALSE; adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask); |