livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BOOL -> bool for sdl2

meow-7.2.2
Beq 2024-02-19 02:25:50 +00:00
parent c20c2b4340
commit a2a72ebd70
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llwindow/llkeyboardsdl2.cpp
View File

@ -204,12 +204,12 @@ static U32 adjustNativekeyFromUnhandledMask(const U32 key, const U32 mask)
}
BOOL LLKeyboardSDL::handleKeyDown(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;
BOOL handled = FALSE;
bool handled = false;
adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
@ -224,12 +224,12 @@ BOOL LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask)
}
BOOL LLKeyboardSDL::handleKeyUp(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;
BOOL handled = FALSE;
bool handled = false;
adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask);
@ -243,7 +243,7 @@ BOOL LLKeyboardSDL::handleKeyUp(const U32 key, const U32 mask)
return handled;
}
MASK LLKeyboardSDL::currentMask(BOOL for_mouse_event)
MASK LLKeyboardSDL::currentMask(bool for_mouse_event)
{
MASK result = MASK_NONE;
SDL_Keymod mask = SDL_GetModState();
@ -292,7 +292,7 @@ void LLKeyboardSDL::scanKeyboard()
}
BOOL LLKeyboardSDL::translateNumpadKey( const U32 os_key, KEY *translated_key)
bool LLKeyboardSDL::translateNumpadKey( const U32 os_key, KEY *translated_key)
{
return translateKey(os_key, translated_key);
}

10
indra/llwindow/llkeyboardsdl2.h
View File

@ -11,16 +11,16 @@ public:
LLKeyboardSDL();
/*virtual*/ ~LLKeyboardSDL() {};
/*virtual*/ BOOL handleKeyUp(const U32 key, MASK mask);
/*virtual*/ BOOL handleKeyDown(const U32 key, MASK mask);
/*virtual*/ bool handleKeyUp(const U32 key, MASK mask);
/*virtual*/ bool handleKeyDown(const U32 key, MASK mask);
/*virtual*/ void resetMaskKeys();
/*virtual*/ MASK currentMask(BOOL for_mouse_event);
/*virtual*/ MASK currentMask(bool for_mouse_event);
/*virtual*/ void scanKeyboard();
protected:
MASK updateModifiers(const U32 mask);
void setModifierKeyLevel( KEY key, BOOL new_state );
BOOL translateNumpadKey( const U32 os_key, KEY *translated_key );
void setModifierKeyLevel( KEY key, bool new_state );
bool translateNumpadKey( const U32 os_key, KEY *translated_key );
U16 inverseTranslateNumpadKey(const KEY translated_key);
private:
std::map<U32, KEY> mTranslateNumpadMap; // special map for translating OS keys to numpad keys