diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:43:28 +0300 | 
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:56:09 +0300 | 
| commit | 1b68f71348ecf3983b76b40d7940da8377f049b7 (patch) | |
| tree | 2974eddaef130a067c26033d60a59fc790365b3d /indra/llwindow/llkeyboardmacosx.h | |
| parent | af4ea94efc1999f3b19fd8d643d0331f0b77e265 (diff) | |
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
Diffstat (limited to 'indra/llwindow/llkeyboardmacosx.h')
| -rw-r--r-- | indra/llwindow/llkeyboardmacosx.h | 52 | 
1 files changed, 26 insertions, 26 deletions
| diff --git a/indra/llwindow/llkeyboardmacosx.h b/indra/llwindow/llkeyboardmacosx.h index f9d014ab70..d6895f684d 100644 --- a/indra/llwindow/llkeyboardmacosx.h +++ b/indra/llwindow/llkeyboardmacosx.h @@ -1,25 +1,25 @@ -/**  +/**   * @file llkeyboardmacosx.h   * @brief Handler for assignable key bindings   *   * $LicenseInfo:firstyear=2004&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2010, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ @@ -31,34 +31,34 @@  // These more or less mirror their equivalents in NSEvent.h.  enum EMacEventKeys { -	MAC_SHIFT_KEY = 1 << 17, -	MAC_CTRL_KEY = 1 << 18, -	MAC_ALT_KEY = 1 << 19, -	MAC_CMD_KEY = 1 << 20, -	MAC_FN_KEY = 1 << 23 +    MAC_SHIFT_KEY = 1 << 17, +    MAC_CTRL_KEY = 1 << 18, +    MAC_ALT_KEY = 1 << 19, +    MAC_CMD_KEY = 1 << 20, +    MAC_FN_KEY = 1 << 23  };  class LLKeyboardMacOSX : public LLKeyboard  {  public: -	LLKeyboardMacOSX(); -	/*virtual*/ ~LLKeyboardMacOSX() {}; -	 -	/*virtual*/ BOOL	handleKeyUp(const U16 key, MASK mask); -	/*virtual*/ BOOL	handleKeyDown(const U16 key, MASK mask); -	/*virtual*/ void	resetMaskKeys(); -	/*virtual*/ MASK	currentMask(BOOL for_mouse_event); -	/*virtual*/ void	scanKeyboard(); -	/*virtual*/ void	handleModifier(MASK mask); -	 +    LLKeyboardMacOSX(); +    /*virtual*/ ~LLKeyboardMacOSX() {}; + +    /*virtual*/ BOOL    handleKeyUp(const U16 key, MASK mask); +    /*virtual*/ BOOL    handleKeyDown(const U16 key, MASK mask); +    /*virtual*/ void    resetMaskKeys(); +    /*virtual*/ MASK    currentMask(BOOL for_mouse_event); +    /*virtual*/ void    scanKeyboard(); +    /*virtual*/ void    handleModifier(MASK mask); +  protected: -	MASK	updateModifiers(const U32 mask); -	void	setModifierKeyLevel( KEY key, BOOL new_state ); -	BOOL	translateNumpadKey( const U16 os_key, KEY *translated_key ); -	U16		inverseTranslateNumpadKey(const KEY translated_key); +    MASK    updateModifiers(const U32 mask); +    void    setModifierKeyLevel( KEY key, BOOL new_state ); +    BOOL    translateNumpadKey( const U16 os_key, KEY *translated_key ); +    U16     inverseTranslateNumpadKey(const KEY translated_key);  private: -	std::map<U16, KEY> mTranslateNumpadMap;  // special map for translating OS keys to numpad keys -	std::map<KEY, U16> mInvTranslateNumpadMap; // inverse of the above +    std::map<U16, KEY> mTranslateNumpadMap;  // special map for translating OS keys to numpad keys +    std::map<KEY, U16> mInvTranslateNumpadMap; // inverse of the above  };  #endif | 
