diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-15 16:28:26 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-15 23:24:06 +0800 |
| commit | 6d31ea65d2c597397971fb97fc17610277104e1b (patch) | |
| tree | ac19cde920e9dccac900dfa6a47599cfeedef893 /indra/llwindow/llwindowsdl.h | |
| parent | ee14fd56f2b49e4fb38822c85bab4d342117a177 (diff) | |
SDL 1.2 to 2.0 migration
Both keycodes and scancodes are now 32 bits, so the key type is
lengthened from U16 to U32.
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
| -rw-r--r-- | indra/llwindow/llwindowsdl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 57885907b4..e8a93247f3 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -32,12 +32,12 @@ #include "llwindow.h" #include "lltimer.h" -#include "SDL/SDL.h" -#include "SDL/SDL_endian.h" +#include "SDL2/SDL.h" +#include "SDL2/SDL_endian.h" #if LL_X11 // get X11-specific headers for use in low-level stuff like copy-and-paste support -#include "SDL/SDL_syswm.h" +#include "SDL2/SDL_syswm.h" #endif // AssertMacros.h does bad things. @@ -181,15 +181,15 @@ protected: void destroyContext(); void setupFailure(const std::string& text, const std::string& caption, U32 type); void fixWindowSize(void); - U32 SDLCheckGrabbyKeys(SDLKey keysym, BOOL gain); - BOOL SDLReallyCaptureInput(BOOL capture); + U32 SDLCheckGrabbyKeys(SDL_Keycode keysym, BOOL gain); + //BOOL SDLReallyCaptureInput(BOOL capture); // // Platform specific variables // U32 mGrabbyKeyFlags; int mReallyCapturedCount; - SDL_Surface * mWindow; + SDL_Window * mWindow; std::string mWindowTitle; double mOriginalAspectRatio; BOOL mNeedsResize; // Constructor figured out the window is too big, it needs a resize. @@ -215,7 +215,7 @@ private: U32 mKeyScanCode; U32 mKeyVirtualKey; - SDLMod mKeyModifiers; + Uint16 mKeyModifiers; }; |